From a3d52e8a0ed34dd424263af3a7b2781136df32c7 Mon Sep 17 00:00:00 2001 From: Adam Collins Date: Mon, 21 Oct 2024 07:38:11 +1000 Subject: [PATCH 1/5] #317 add description field to ws/speciesList --- build.gradle | 2 +- grails-app/conf/application.yml | 6 ++++-- .../au/org/ala/specieslist/WebServiceController.groovy | 2 ++ 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 262902d6..b742bd03 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - version "5.2.3" + version "5.3.0-SNAPSHOT" group "au.org.ala" } diff --git a/grails-app/conf/application.yml b/grails-app/conf/application.yml index 0ef47185..de22270c 100644 --- 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/WebServiceController.groovy b/grails-app/controllers/au/org/ala/specieslist/WebServiceController.groovy index 601fe30b..ecb5cfc9 100755 --- 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, From 7fffd90535621c75d8618d0c3dad5c1012c7fd69 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Tue, 26 Nov 2024 16:01:58 +1100 Subject: [PATCH 2/5] Delete .DS_Store --- .DS_Store | Bin 6148 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 8f7026824783bb4152ab96dd1a1ed6fbf1b0dd22..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6148 zcmeHKI|>3Z5S{S@f{mqRuHX%V=n1@l$btx>AZWdn=kjR2`83P2ofgU)n7m{%FCnkk z*%1+4-}>w&gLxhmpaMUyfPEhd+^{CLf&S^h;4J`fg0LIr-b(Cld`t<9%r?-!1r*=dBM#vcM1kC$3QQ~SXen;dQ#*Sn`6Hw Uwt-GZ-0496445u7D)4Ou-khQox&QzG From 92b2e11a6d662d11fc011939ff34ed2476d6bf23 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Tue, 26 Nov 2024 16:03:21 +1100 Subject: [PATCH 3/5] #319 Fix for SQL error for family popup link --- .gitignore | 1 + grails-app/views/speciesListItem/_facet.gsp | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 35674d19..6a92efef 100644 --- 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/grails-app/views/speciesListItem/_facet.gsp b/grails-app/views/speciesListItem/_facet.gsp index 960b055e..1a570ca6 100644 --- a/grails-app/views/speciesListItem/_facet.gsp +++ b/grails-app/views/speciesListItem/_facet.gsp @@ -64,7 +64,7 @@ ${arr[0]} + 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]} ${arr[1]} From 409e2fc1d929fbb941e8fffbfe727bafa3ae7e1c Mon Sep 17 00:00:00 2001 From: vjrj Date: Tue, 26 Nov 2024 13:58:50 +0100 Subject: [PATCH 4/5] Fix for #321 --- .../au/org/ala/specieslist/SpeciesListController.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/grails-app/controllers/au/org/ala/specieslist/SpeciesListController.groovy b/grails-app/controllers/au/org/ala/specieslist/SpeciesListController.groovy index f19a9075..c74ca3b8 100644 --- 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]) From 13238210cf4ab57d29c9d18a04185774a5970ba2 Mon Sep 17 00:00:00 2001 From: Nick dos Remedios Date: Wed, 27 Nov 2024 13:50:14 +1100 Subject: [PATCH 5/5] Version 5.2.4 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index b742bd03..6335594b 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ buildscript { - version "5.3.0-SNAPSHOT" + version "5.2.4" group "au.org.ala" }