Merge branch 'develop'

# Conflicts: # build.gradle
AtlasOfLivingAustralia · Feb 12, 2024 · e38dfc4 · e38dfc4
2 parents 040426a + b8aa171
commit e38dfc4
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,5 +1,5 @@
 buildscript {
-    version "5.1.0"
+    version "5.1.1"
     group "au.org.ala"
 }
 

diff --git a/grails-app/controllers/au/org/ala/collectory/LookupController.groovy b/grails-app/controllers/au/org/ala/collectory/LookupController.groovy
@@ -146,9 +146,9 @@ class LookupController {
             if (pg) {
                 if (pg.uid[0..1] == 'co') {
                     render collectionService.buildSummary(pg) as JSON
-                } else if (pg[0..1] == 'in') {
+                } else if (pg.uid[0..1] == 'in') {
                     render institutionService.buildSummary(pg) as JSON
-                } else if (pg[0..1] == 'dr') {
+                } else if (pg.uid[0..1] == 'dr') {
                     render dataResourceService.buildSummary(pg) as JSON
                 } else {
                     render pg.buildSummary() as JSON
@@ -164,9 +164,9 @@ class LookupController {
             domain.list().each {
                 if (it.uid[0..1] == 'co') {
                     list << collectionService.buildSummary(it)
-                } else if (pg[0..1] == 'in') {
+                } else if (it.uid[0..1] == 'in') {
                     list << institutionService.buildSummary(it)
-                } else if (pg[0..1] == 'dr') {
+                } else if (it.uid[0..1] == 'dr') {
                     list << dataResourceService.buildSummary(it)
                 } else {
                     list << it.buildSummary()
@@ -235,9 +235,9 @@ class LookupController {
         if (instance) {
             if (instance.uid[0..1] == 'co') {
                 render collectionService.buildSummary(instance) as JSON
-            } else if (pg[0..1] == 'in') {
+            } else if (instance.uid[0..1] == 'in') {
                 render institutionService.buildSummary(instance) as JSON
-            } else if (pg[0..1] == 'dr') {
+            } else if (instance.uid[0..1] == 'dr') {
                 render dataResourceService.buildSummary(instance) as JSON
             } else {
                 render instance.buildSummary() as JSON

diff --git a/grails-app/domain/au/org/ala/collectory/Institution.groovy b/grails-app/domain/au/org/ala/collectory/Institution.groovy
@@ -104,11 +104,11 @@ class Institution implements ProviderGroup, Serializable {
      * @return List of Collection
      */
     def listCollections() {
-        List result = collections.collect {it}
+        List result = collections.collect { it }
         if (childInstitutions) {
             def list = childInstitutions.tokenize(' ')
-            Collections.createCriteria().list (fetch: [collections: 'join']) {
-                in ('id', list)
+            Institution.createCriteria().list(fetch: [collections: 'join']) {
+                in ('uid', list )
             }.each {
                 result.addAll it.listCollections()
             }