Merge branch 'develop' - Bump up to 4.5.1

AtlasOfLivingAustralia · Oct 20, 2023 · 1266ed3 · 1266ed3
2 parents f11108a + 23c10cc
commit 1266ed3
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/build.gradle b/build.gradle
@@ -16,7 +16,7 @@ plugins {
  id "com.gorylenko.gradle-git-properties" version "2.4.1"
 }
 
-version "4.5.0"
+version "4.5.1"
 group "au.org.ala"
 
 apply plugin:"eclipse"

diff --git a/grails-app/services/au/org/ala/specieslist/HelperService.groovy b/grails-app/services/au/org/ala/specieslist/HelperService.groovy
@@ -893,9 +893,11 @@ class HelperService {
  totalRows = SpeciesListItem.count();
  }
  }
- rematchLog.total = totalRows
- rematchLog.remaining = totalRows
- rematchLog.persist()
+ RematchLog.withTransaction {
+ rematchLog.total = totalRows
+ rematchLog.remaining = totalRows
+ rematchLog.persist()
+ }
 
  try {
  while (true) {
@@ -969,16 +971,12 @@ class HelperService {
  log.info("Rematched ${offset} of ${totalRows} completed, time elapsed:" + TimeCategory.minus(new Date(), start))
  rematchLog.remaining = totalRows - offset
  }
-
- //SpeciesListItem
  RematchLog.withTransaction {
  rematchLog.logs = "ID: ${items.last().id} was rematched!"
  rematchLog.currentRecordId = items.last().id
  rematchLog.recentProcessTime = new Date()
  rematchLog.persist()
  }
-
-
  }// end full iteration
  rematchLog.status = Status.COMPLETED
  rematchLog.endTime = new Date()
@@ -989,7 +987,7 @@ class HelperService {
  rematchLog.status = Status.FAILED
  rematchLog.endTime = new Date()
  } finally {
- RematchLog.withTransaction {
+ RematchLog.withTransaction{
  rematchLog.persist()
  }
  } // end try

diff --git a/grails-app/views/admin/specieslists.gsp b/grails-app/views/admin/specieslists.gsp
@@ -33,8 +33,15 @@
  }).error(function (jqXHR, textStatus, error) {
  alert("An error occurred: " + error + " - unable to rematch your lists.");
  })
- jQuery.fancybox.close();
- window.location.reload()
+ jQuery.fancybox.open("<div style=\"padding:20px;width:400px;text-align:center;\"><img src='${asset.assetPath(src:'spinner.gif')}' id='spinner'/>Processing rematching request ...</div></div>", {
+ 'padding': 0,
+ 'margin': 0,
+ 'width': 'auto',
+ 'height': 'auto',
+ afterShow: function () {
+ setTimeout(function(){window.location.reload()}, 3000);
+ }
+ })
  })
  }
  })