Merge pull request #323 from AtlasOfLivingAustralia/release/5.2.4

Release/5.2.4
AtlasOfLivingAustralia · Nov 27, 2024 · a8a3e14 · a8a3e14
2 parents f233db3 + 1323821
commit a8a3e14
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 6 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -6,6 +6,7 @@ out
 /.slcache
 /logs
 *.iml
+.DS_Store
 grails-app/.DS_Store
 grails-app/controllers/.DS_Store
 grails-app/controllers/au/.DS_Store

diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    version "5.2.3"
+    version "5.2.4"
     group "au.org.ala"
 }
 

diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml
@@ -1,6 +1,8 @@
 ---
-logging:
-    config: /data/specieslist-webapp/config/logback.xml
+# Example of what to put in your /data/specieslist-webapp/config/specieslist-webapp-config.properties file
+# if you want different logging for local development. This is the default for production.
+#logging:
+#    config: /data/specieslist-webapp/config/logback.xml
 
 grails:
     profile: web

diff --git a/grails-app/controllers/au/org/ala/specieslist/SpeciesListController.groovy b/grails-app/controllers/au/org/ala/specieslist/SpeciesListController.groovy
@@ -91,10 +91,10 @@ class SpeciesListController {
         if(sl){
             helperService.deleteDataResourceForList(sl.dataResourceUid)
             List msIds = SpeciesListItem.executeQuery("select sli.matchedSpecies.id as id from SpeciesListItem as sli where dataResourceUid = :dataResourceUid", ["dataResourceUid": sl.dataResourceUid])
-            MatchedSpecies.executeUpdate("delete from MatchedSpecies where id in (:msIds)", ["msIds": msIds])
-            log.debug("Deleted matched species (${msIds.size()}) ")
             SpeciesListItem.executeUpdate("delete from SpeciesListItem where dataResourceUid = :dataResourceUid", ["dataResourceUid": sl.dataResourceUid])
             log.debug("Deleted species in list: ${sl.dataResourceUid}")
+            MatchedSpecies.executeUpdate("delete from MatchedSpecies where id in (:msIds)", ["msIds": msIds])
+            log.debug("Deleted matched species (${msIds.size()}) ")
             SpeciesListKVP.executeUpdate("delete from SpeciesListKVP where dataResourceUid = :dataResourceUid", ["dataResourceUid": sl.dataResourceUid])
             log.debug("Deleted KV pairs in list: ${sl.dataResourceUid}")
             SpeciesList.executeUpdate("delete from SpeciesList where dataResourceUid = :dataResourceUid", ["dataResourceUid": sl.dataResourceUid])

diff --git a/grails-app/controllers/au/org/ala/specieslist/WebServiceController.groovy b/grails-app/controllers/au/org/ala/specieslist/WebServiceController.groovy
@@ -288,6 +288,7 @@ class WebServiceController {
             def retValue = [
                 dataResourceUid: sl.dataResourceUid,
                 listName       : sl.listName,
+                description    : sl.description,
                 dateCreated    : sl.dateCreated,
                 lastUpdated    : sl.lastUpdated,
                 lastUploaded   : sl.lastUploaded,
@@ -330,6 +331,7 @@ class WebServiceController {
                                 [
                                  dataResourceUid: it.dataResourceUid,
                                  listName       : it.listName,
+                                 description    : it.description,
                                  listType       : it?.listType?.toString(),
                                  dateCreated    : it.dateCreated,
                                  lastUpdated    : it.lastUpdated,

diff --git a/grails-app/views/speciesListItem/_facet.gsp b/grails-app/views/speciesListItem/_facet.gsp
@@ -64,7 +64,7 @@
                                             </g:if>
                                             <g:else>
                                                 <td><g:link action="list" id="${params.id}"
-                                                            params="${[fq: sl.buildFqList(fqs: fqs, fq: "${key}:${arr[0]}"), q: params.q, max: params.max]}">${arr[0]}</g:link></td>
+                                                            params="${[fq: sl.buildFqList(fqs: fqs, fq: "${QueryService.MATCHED_FAMILY.equals(key) ? 'matched family' : key}:${arr[0]}"), q: (params.q) ?: null, max: params.max]}">${arr[0]}</g:link></td>
                                                 <td style="text-align: right; border-right-style: none;">${arr[1]}</td>
                                             </g:else>
                                         </tr>