AtlasOfLivingAustralia#209

Workaround until Collectory contacts.json bug is fixed
brucehyslop · Dec 6, 2021 · 646c31f · 646c31f
1 parent 61a959c
commit 646c31f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/grails-app/conf/plugin.groovy b/grails-app/conf/plugin.groovy
@@ -90,7 +90,7 @@ test.var = "test"
 // used to link temporary data resources back to an originating sandbox.
 sandbox.uploadSource=''
 advancedTaxaField = "taxa" // used in advanced form for the 4 taxa query inputs
-
+alerts.myannotation.enabled = false
 clubRoleForHub = "ROLE_ADMIN"
 // whether map or list is the default tab to show - empty for list and "mapView" for map
 defaultListView = "" // 'mapView' or 'listView'

diff --git a/grails-app/controllers/au/org/ala/biocache/hubs/OccurrenceController.groovy b/grails-app/controllers/au/org/ala/biocache/hubs/OccurrenceController.groovy
@@ -393,7 +393,12 @@ class OccurrenceController {
 
  String userEmail = authService?.getEmail()
  Boolean isCollectionAdmin = false
- Boolean userHasRoleAdmin = authService?.userInRole(CASRoles.ROLE_ADMIN)
+ Boolean userHasRoleAdmin = false
+
+ // Check (optionally comma-separated) list of authorise.roles - if we get `true` then stop checking
+ grailsApplication.config.getProperty('authorise.roles', String).tokenize(',').each {
+ !userHasRoleAdmin ? userHasRoleAdmin = authService?.userInRole( it ) : null
+ }
 
  if (userHasRoleAdmin) {
  isCollectionAdmin = true