Merge branch 'dev' into feature/issue3292

AtlasOfLivingAustralia · Aug 23, 2024 · 8cfd3fa · 8cfd3fa
2 parents 3e2a472 + 1c118dc
commit 8cfd3fa
Show file tree

Hide file tree

Showing 4 changed files with 141 additions and 54 deletions.
diff --git a/grails-app/controllers/au/org/ala/ecodata/SearchController.groovy b/grails-app/controllers/au/org/ala/ecodata/SearchController.groovy
@@ -513,6 +513,7 @@ class SearchController {
         params.facets = ELECTORATES
         SearchResponse result = elasticSearchService.search(params.query, params, HOMEPAGE_INDEX)
         List<String> electorates = result.aggregations?.find{it.name == ELECTORATES}?.buckets?.collect{it.key}
+        electorates?.removeAll(Arrays.asList(null,""))
         List tabsToExport = params.getList('tabs')
         boolean formSectionPerTab = params.getBoolean("formSectionPerTab", false)
         Map dataDescriptionLookup = null

diff --git a/grails-app/services/au/org/ala/ecodata/MetadataService.groovy b/grails-app/services/au/org/ala/ecodata/MetadataService.groovy
@@ -1210,6 +1210,7 @@ class MetadataService {
                     score.target = target?.target
                     score.periodTargets = target?.periodTargets
                     score.targetDate = target?.targetDate
+                    score.relatedOutcomes = target?.outcomeTargets?.relatedOutcomes?.flatten()
                 }else
                     score.delete = true //prepare for delete
             }