From 20fda9aeb90305d929f24419ed933c20b3c0322f Mon Sep 17 00:00:00 2001 From: Simon Bear Date: Thu, 8 Nov 2018 18:22:04 +1100 Subject: [PATCH 01/32] #634 Use updated ALA Map plugin --- grails-app/conf/BuildConfig.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grails-app/conf/BuildConfig.groovy b/grails-app/conf/BuildConfig.groovy index 6efc69f0..5fad7c85 100644 --- a/grails-app/conf/BuildConfig.groovy +++ b/grails-app/conf/BuildConfig.groovy @@ -85,7 +85,7 @@ grails.project.dependency.resolution = { compile ":cache:1.1.8" compile ":cors:1.1.6" compile ":csv:0.3.1" - compile(":ala-map:2.0.4") { + compile(":ala-map:2.1.8-SNAPSHOT") { excludes "resources" } compile(":ala-ws-plugin:1.6.1") { From daed0cf611da1933970b74d2bf506ba3a00dde75 Mon Sep 17 00:00:00 2001 From: temi Date: Fri, 9 Nov 2018 10:39:14 +1100 Subject: [PATCH 02/32] #627 - fixed a bug with ng-ckeditor - event listener wrongly configured. --- grails-app/assets/thirdparty/ckeditor/ng-ckeditor-0.2.1.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/grails-app/assets/thirdparty/ckeditor/ng-ckeditor-0.2.1.js b/grails-app/assets/thirdparty/ckeditor/ng-ckeditor-0.2.1.js index 05e7355b..c57e3662 100644 --- a/grails-app/assets/thirdparty/ckeditor/ng-ckeditor-0.2.1.js +++ b/grails-app/assets/thirdparty/ckeditor/ng-ckeditor-0.2.1.js @@ -140,7 +140,10 @@ onUpdateModelData(true); }); - instance.document.on('keyup', setModelData); + // This fixes a bug in ng-ckeditor that caused #627. + // Previously listener was incorrectly configured. Function setModelData was called on a keystroke + // anywhere on the page. + instance.on('key', setModelData); }); instance.on('customConfigLoaded', function() { configLoaderDef.resolve(); From 5dfd6a0ac31b323a33e42fd554eb5b3a1cc46775 Mon Sep 17 00:00:00 2001 From: Simon Bear Date: Fri, 9 Nov 2018 12:02:12 +1100 Subject: [PATCH 03/32] #634 attempt to fix unit tests --- karma.conf.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 0dd069cb..0d530385 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -45,15 +45,16 @@ module.exports = function (config) { // list of files / patterns to load in the browser files: [ 'node_modules/jasmine-data_driven_tests/src/all.js', - 'https://rawgit.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/jquery-2.1.4/jquery-2.1.4.min.js', - 'https://rawgit.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/leaflet-0.7.7/leaflet.js', - 'https://rawgit.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/Leaflet.Coordinates-0.1.5/Leaflet.Coordinates-0.1.5.min.js', - 'https://rawgit.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/Leaflet.loading-0.1.16/Control.Loading.js', - 'https://rawgit.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/Leaflet.EasyButton-1.2.0/easy-button.js', - 'https://rawgit.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/urijs-1.18.0/URI.js', - 'https://rawgit.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/layers/SmartWmsLayer.js', - 'https://rawgit.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/Map.js', - 'https://rawgit.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/OccurrenceMap.js', + 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/jquery-2.1.4/jquery-2.1.4.min.js', + 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/leaflet-0.7.7/leaflet.js', + 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/Leaflet.Coordinates-0.1.5/Leaflet.Coordinates-0.1.5.min.js', + 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/Leaflet.loading-0.1.16/Control.Loading.js', + 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/Leaflet.EasyButton-1.2.0/easy-button.js', + 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/urijs-1.18.0/URI.js', + 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/layers/SmartWmsLayer.js', + 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/Map.js', + 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/OccurrenceMap.js', + 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/OccurrenceMap.js', 'grails-app/assets/thirdparty/modernizr/modernizer.js', 'grails-app/assets/thirdparty/angular/angular-1.3.20.js', 'grails-app/assets/thirdparty/angular/angular-sanitize-1.3.20.js', From 44be59f0f2c5408bdd4cdc71d84b857c76828a24 Mon Sep 17 00:00:00 2001 From: Simon Bear Date: Tue, 13 Nov 2018 15:26:09 +1100 Subject: [PATCH 04/32] Fix karma tests --- karma.conf.js | 1 - 1 file changed, 1 deletion(-) diff --git a/karma.conf.js b/karma.conf.js index 0d530385..7a136006 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -54,7 +54,6 @@ module.exports = function (config) { 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/layers/SmartWmsLayer.js', 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/Map.js', 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/OccurrenceMap.js', - 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/OccurrenceMap.js', 'grails-app/assets/thirdparty/modernizr/modernizer.js', 'grails-app/assets/thirdparty/angular/angular-1.3.20.js', 'grails-app/assets/thirdparty/angular/angular-sanitize-1.3.20.js', From aa3084d6ea0ed3fa02fbba72aff9196aebea52d3 Mon Sep 17 00:00:00 2001 From: Simon Bear Date: Wed, 14 Nov 2018 15:47:50 +1100 Subject: [PATCH 05/32] Fix karma unit tests --- karma.conf.js | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/karma.conf.js b/karma.conf.js index 7a136006..ef042a77 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -45,15 +45,15 @@ module.exports = function (config) { // list of files / patterns to load in the browser files: [ 'node_modules/jasmine-data_driven_tests/src/all.js', - 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/jquery-2.1.4/jquery-2.1.4.min.js', - 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/leaflet-0.7.7/leaflet.js', - 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/Leaflet.Coordinates-0.1.5/Leaflet.Coordinates-0.1.5.min.js', - 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/Leaflet.loading-0.1.16/Control.Loading.js', - 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/Leaflet.EasyButton-1.2.0/easy-button.js', - 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/vendor/urijs-1.18.0/URI.js', - 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/layers/SmartWmsLayer.js', - 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/Map.js', - 'https://raw.githubusercontent.com/AtlasOfLivingAustralia/ala-map-plugin/master/web-app/js/OccurrenceMap.js', + 'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ala-map-plugin/web-app/vendor/jquery-2.1.4/jquery-2.1.4.min.js', + 'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ala-map-plugin/web-app/vendor/leaflet-0.7.7/leaflet.js', + 'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ala-map-plugin/web-app/vendor/Leaflet.Coordinates-0.1.5/Leaflet.Coordinates-0.1.5.min.js', + 'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ala-map-plugin/web-app/vendor/Leaflet.loading-0.1.16/Control.Loading.js', + 'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ala-map-plugin/web-app/vendor/Leaflet.EasyButton-1.2.0/easy-button.js', + 'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ala-map-plugin/web-app/vendor/urijs-1.18.0/URI.js', + 'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ala-map-plugin/web-app/js/layers/SmartWmsLayer.js', + 'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ala-map-plugin/web-app/js/Map.js', + 'https://cdn.jsdelivr.net/gh/AtlasOfLivingAustralia/ala-map-plugin/web-app/js/OccurrenceMap.js', 'grails-app/assets/thirdparty/modernizr/modernizer.js', 'grails-app/assets/thirdparty/angular/angular-1.3.20.js', 'grails-app/assets/thirdparty/angular/angular-sanitize-1.3.20.js', @@ -85,6 +85,7 @@ module.exports = function (config) { 'test/js/specs/MockConfigModule.js', 'test/js/specs/**/*.js' ], + crossOriginAttribute: true, // list of files to exclude From e57b41181900df24512bde90fc1b438f2a1526ab Mon Sep 17 00:00:00 2001 From: Simon Bear Date: Wed, 14 Nov 2018 16:59:20 +1100 Subject: [PATCH 06/32] AtlasOfLivingAustralia/profile-hub#636 - Don't crash at the end of a nullable call chain --- grails-app/services/au/org/ala/profile/hub/ExportService.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grails-app/services/au/org/ala/profile/hub/ExportService.groovy b/grails-app/services/au/org/ala/profile/hub/ExportService.groovy index 1b9c5947..899d9aec 100644 --- a/grails-app/services/au/org/ala/profile/hub/ExportService.groovy +++ b/grails-app/services/au/org/ala/profile/hub/ExportService.groovy @@ -522,7 +522,7 @@ class ExportService { } if (nslNameIdentifier) { - def nslNameDetails = nslService.getNameDetails(nslNameIdentifier)?.resp?.name?.primaryInstance[0] ?: null + def nslNameDetails = nslService.getNameDetails(nslNameIdentifier)?.resp?.name?.primaryInstance?.get(0) ?: null String nslProtologue = nslNameDetails?.citationHtml?: null if (nslProtologue && nslNameDetails?.page) { nslProtologue += ": " + nslNameDetails.page From 2f09d101f08dbe5d65cd8ef7db196214bdb8a23c Mon Sep 17 00:00:00 2001 From: Simon Bear Date: Thu, 15 Nov 2018 01:45:53 +1100 Subject: [PATCH 07/32] Bump version number to next SNAPSHOT --- application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application.properties b/application.properties index ad2bb6b4..7321e819 100644 --- a/application.properties +++ b/application.properties @@ -2,4 +2,4 @@ #Wed Dec 21 11:09:46 AEDT 2016 app.grails.version=2.5.6 app.name=profile-hub -app.version=2.3 +app.version=2.4-SNAPSHOT From 09ff6b2ff8b6255e33da99e4c75ee8631990afb4 Mon Sep 17 00:00:00 2001 From: Rita Chen Date: Thu, 15 Nov 2018 14:41:32 +1100 Subject: [PATCH 08/32] #652, removed deleted term from the replacement candidate list. --- .../profileEditor/directives/vocabularyEditor.js | 15 +++++++++++---- .../templates/removeTermPopup.tpl.htm | 6 +++++- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/grails-app/assets/javascripts/profileEditor/directives/vocabularyEditor.js b/grails-app/assets/javascripts/profileEditor/directives/vocabularyEditor.js index c8190eca..f5df8df2 100644 --- a/grails-app/assets/javascripts/profileEditor/directives/vocabularyEditor.js +++ b/grails-app/assets/javascripts/profileEditor/directives/vocabularyEditor.js @@ -49,7 +49,8 @@ profileEditor.directive('vocabularyEditor', function ($browser) { $scope.removeVocabTerm = function (index, form) { var promise = profileService.findUsagesOfVocabTerm($scope.opusId, $scope.vocabId, $scope.vocabulary.terms[index].termId); promise.then(function (data) { - if (data.usageCount == 0) { + if (data.usageCount == 0 && + $filter('filter')($scope.replacements, {'newTermName':$scope.vocabulary.terms[index].name}).length == 0) { var deletedItemOrder = $scope.vocabulary.terms[index].order; $scope.vocabulary.terms.splice(index, 1); @@ -85,9 +86,15 @@ profileEditor.directive('vocabularyEditor', function ($browser) { return $scope.vocabulary.terms[existingTermIndex]; }, terms: function() { - var terms = angular.copy($scope.vocabulary.terms); - var deletedItemOrder = terms[existingTermIndex].order; - terms.splice(existingTermIndex, 1); + var terms = [];//angular.copy($scope.vocabulary.terms); + var itemToDel = $scope.vocabulary.terms[existingTermIndex]; + var deletedItemOrder = $scope.vocabulary.terms[existingTermIndex].order; + angular.forEach($scope.vocabulary.terms, function(term) { + if ($filter('filter')($scope.replacements, {'existingTermId':term.termId}).length == 0 && + term.termId != itemToDel.termId) { + terms.push(term); + } + }); angular.forEach(terms, function(term) { if (term.order > deletedItemOrder) { diff --git a/grails-app/assets/javascripts/profileEditor/templates/removeTermPopup.tpl.htm b/grails-app/assets/javascripts/profileEditor/templates/removeTermPopup.tpl.htm index 094dfa92..37787056 100644 --- a/grails-app/assets/javascripts/profileEditor/templates/removeTermPopup.tpl.htm +++ b/grails-app/assets/javascripts/profileEditor/templates/removeTermPopup.tpl.htm @@ -4,12 +4,16 @@

Remove vocabulary term

-

+

The vocabulary term {{removeTermCtrl.existingTerm.name}} is being used in {{removeTermCtrl.usageCount}} profile(s). You must either select a replacement term or manually find and remove all usages before you can delete the term.

+

+ The vocabulary term {{removeTermCtrl.existingTerm.name}} is being selected as a replacement term. + You must either select another replacement term or remove all usages before you can delete the term. +

From 1ddac9b54bc01328b70cf75a388b0b1ef0de19b8 Mon Sep 17 00:00:00 2001 From: Rita Chen Date: Thu, 15 Nov 2018 15:01:19 +1100 Subject: [PATCH 09/32] #652, deleted unused code. --- .../javascripts/profileEditor/directives/vocabularyEditor.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grails-app/assets/javascripts/profileEditor/directives/vocabularyEditor.js b/grails-app/assets/javascripts/profileEditor/directives/vocabularyEditor.js index f5df8df2..261ba708 100644 --- a/grails-app/assets/javascripts/profileEditor/directives/vocabularyEditor.js +++ b/grails-app/assets/javascripts/profileEditor/directives/vocabularyEditor.js @@ -86,7 +86,7 @@ profileEditor.directive('vocabularyEditor', function ($browser) { return $scope.vocabulary.terms[existingTermIndex]; }, terms: function() { - var terms = [];//angular.copy($scope.vocabulary.terms); + var terms = []; var itemToDel = $scope.vocabulary.terms[existingTermIndex]; var deletedItemOrder = $scope.vocabulary.terms[existingTermIndex].order; angular.forEach($scope.vocabulary.terms, function(term) { From 60631f6c62c3bfe8197d578d680a84c7cbd39c4a Mon Sep 17 00:00:00 2001 From: Javier Molina Date: Fri, 16 Nov 2018 09:46:23 +1100 Subject: [PATCH 10/32] #644 - Turn on Nomenclature field in taxon profiles - Nomenclature now appearing in public view - Fix formatting, for public view, for a few sections - Fix empty sections appearing in public view, again for a few sections --- grails-app/views/common/_attachments.gsp | 3 ++- grails-app/views/profile/_bibliography.gsp | 2 +- grails-app/views/profile/_layoutSingleTab.gsp | 6 ++++-- grails-app/views/profile/_layoutTabbed.gsp | 10 +++++----- grails-app/views/profile/_nomenclaturePanel.gsp | 7 ++++--- 5 files changed, 16 insertions(+), 12 deletions(-) diff --git a/grails-app/views/common/_attachments.gsp b/grails-app/views/common/_attachments.gsp index 390458bb..4915707f 100644 --- a/grails-app/views/common/_attachments.gsp +++ b/grails-app/views/common/_attachments.gsp @@ -1,4 +1,5 @@ -
+
diff --git a/grails-app/views/profile/_bibliography.gsp b/grails-app/views/profile/_bibliography.gsp index 1124cfee..5be19068 100644 --- a/grails-app/views/profile/_bibliography.gsp +++ b/grails-app/views/profile/_bibliography.gsp @@ -1,4 +1,4 @@ -
diff --git a/grails-app/views/profile/_layoutSingleTab.gsp b/grails-app/views/profile/_layoutSingleTab.gsp index 3b5b79e7..45b0a427 100644 --- a/grails-app/views/profile/_layoutSingleTab.gsp +++ b/grails-app/views/profile/_layoutSingleTab.gsp @@ -34,8 +34,6 @@
- -
@@ -57,6 +55,10 @@
+ + +
- - - -
@@ -44,11 +40,15 @@
- + + + + +
diff --git a/grails-app/views/profile/_nomenclaturePanel.gsp b/grails-app/views/profile/_nomenclaturePanel.gsp index 7d959344..fbe801d7 100644 --- a/grails-app/views/profile/_nomenclaturePanel.gsp +++ b/grails-app/views/profile/_nomenclaturePanel.gsp @@ -1,5 +1,6 @@ -
- +
+
@@ -20,7 +21,7 @@
-
+
From 45502fd055a577d3c591a6f42d34c10a770d0854 Mon Sep 17 00:00:00 2001 From: temi Date: Thu, 15 Nov 2018 15:45:35 +1100 Subject: [PATCH 11/32] #637 - added test cases to verify user with correct privilege is accessing controller actions - added checks to show and hide restricted actions based on privilege --- .../filter/AccessControlFilters.groovy | 4 +- .../org/ala/profile/hub/OpusController.groovy | 4 +- .../ala/profile/hub/ProfileController.groovy | 14 +- grails-app/views/layouts/_login.gsp | 2 +- grails-app/views/profile/_optionsMenu.gsp | 69 ++-- grails-app/views/profile/_publications.gsp | 2 +- .../filter/AccessControlFiltersSpec.groovy | 342 +++++++++++++++++- 7 files changed, 389 insertions(+), 48 deletions(-) diff --git a/grails-app/conf/au/org/ala/profile/filter/AccessControlFilters.groovy b/grails-app/conf/au/org/ala/profile/filter/AccessControlFilters.groovy index 84b9a4cf..64a8ab54 100644 --- a/grails-app/conf/au/org/ala/profile/filter/AccessControlFilters.groovy +++ b/grails-app/conf/au/org/ala/profile/filter/AccessControlFilters.groovy @@ -81,10 +81,10 @@ class AccessControlFilters { authorised = params.isOpusAdmin log.debug "Action ${actionFullName} requires ROLE_PROFILE_ADMIN. User ${request.userPrincipal?.name} has it? ${authorised}" } else if (requiredRole == Role.ROLE_PROFILE_EDITOR.toString()) { - authorised = params.isOpusAdmin || params.isOpusEditor + authorised = params.isOpusAdmin || params.isOpusAuthor || params.isOpusEditor log.debug "Action ${actionFullName} requires ${requiredRole}. User ${request.userPrincipal?.name} has it? ${authorised}" } else if (requiredRole == Role.ROLE_PROFILE_AUTHOR.toString()) { - authorised = params.isOpusAdmin || params.isOpusAuthor || params.isOpusEditor + authorised = params.isOpusAdmin || params.isOpusAuthor log.debug "Action ${actionFullName} requires ${requiredRole}. User ${request.userPrincipal?.name} has it? ${authorised}" } else if (requiredRole == Role.ROLE_PROFILE_REVIEWER.toString()) { authorised = params.isOpusAdmin || params.isOpusAuthor || params.isOpusReviewer || params.isOpusEditor diff --git a/grails-app/controllers/au/org/ala/profile/hub/OpusController.groovy b/grails-app/controllers/au/org/ala/profile/hub/OpusController.groovy index a9955ffc..04192cfe 100644 --- a/grails-app/controllers/au/org/ala/profile/hub/OpusController.groovy +++ b/grails-app/controllers/au/org/ala/profile/hub/OpusController.groovy @@ -9,7 +9,6 @@ import org.springframework.web.multipart.MultipartFile import org.springframework.web.multipart.MultipartHttpServletRequest import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequest -import static au.org.ala.profile.hub.Utils.encPath import static au.org.ala.profile.hub.util.HubConstants.* import static au.org.ala.profile.security.Role.ROLE_ADMIN import static au.org.ala.profile.security.Role.ROLE_PROFILE_ADMIN @@ -104,6 +103,7 @@ class OpusController extends OpusBaseController { } } + @Secured(role = ROLE_PROFILE_ADMIN) def reports() { def opus = profileService.getOpus(params.opusId as String) @@ -326,7 +326,7 @@ class OpusController extends OpusBaseController { } } - @Secured(role = ROLE_ADMIN, opusSpecific = false) + @Secured(role = ROLE_PROFILE_ADMIN, opusSpecific = false) def deleteOpus() { if (!params.opusId) { badRequest "opusId is a required parameter" diff --git a/grails-app/controllers/au/org/ala/profile/hub/ProfileController.groovy b/grails-app/controllers/au/org/ala/profile/hub/ProfileController.groovy index 1b405d2f..6a46696b 100644 --- a/grails-app/controllers/au/org/ala/profile/hub/ProfileController.groovy +++ b/grails-app/controllers/au/org/ala/profile/hub/ProfileController.groovy @@ -14,9 +14,7 @@ import org.springframework.web.multipart.support.DefaultMultipartHttpServletRequ import javax.validation.constraints.NotNull -import static au.org.ala.profile.hub.WebServiceWrapperService.FLORULA_COOKIE -import static au.org.ala.profile.security.Role.ROLE_PROFILE_AUTHOR -import static au.org.ala.profile.security.Role.ROLE_PROFILE_EDITOR +import static au.org.ala.profile.security.Role.* class ProfileController extends BaseController { @@ -30,7 +28,7 @@ class ProfileController extends BaseController { def index() {} - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def edit() { if (!params.opusId || !params.profileId) { badRequest "opusId and profileId are required parameters" @@ -133,7 +131,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def createDraftMode() { if (!params.profileId) { badRequest() @@ -149,7 +147,7 @@ class ProfileController extends BaseController { } @PrivateCollectionSecurityExempt - @Secured(role = ROLE_PROFILE_EDITOR) + @Secured(role = ROLE_PROFILE_ADMIN) def publishDraft() { if (!params.profileId) { badRequest() @@ -220,7 +218,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_EDITOR) + @Secured(role = ROLE_PROFILE_ADMIN) def deleteProfile() { if (!params.profileId || !params.opusId) { badRequest "profileId and opusId are required parameters" @@ -573,7 +571,7 @@ class ProfileController extends BaseController { } @PrivateCollectionSecurityExempt - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_ADMIN) def savePublication() { if (!enabled("publications")) { badRequest "The publications feature has been disabled" diff --git a/grails-app/views/layouts/_login.gsp b/grails-app/views/layouts/_login.gsp index a110ee3d..86bd64c0 100644 --- a/grails-app/views/layouts/_login.gsp +++ b/grails-app/views/layouts/_login.gsp @@ -12,7 +12,7 @@ - +
  •   Add a new profile diff --git a/grails-app/views/profile/_optionsMenu.gsp b/grails-app/views/profile/_optionsMenu.gsp index e44f8347..1467d280 100644 --- a/grails-app/views/profile/_optionsMenu.gsp +++ b/grails-app/views/profile/_optionsMenu.gsp @@ -44,44 +44,49 @@ target="_self">  Edit
    • - -
  • -   {{profileCtrl.showProfileAudit ? 'Hide ' : 'Show '}} revision history - -
    • -
  • -   Lock for major revision -
    • -
  • -   Publish draft changes -
    • -
  • -   Discard draft changes -
    • +
  • +   {{profileCtrl.showProfileAudit ? 'Hide ' : 'Show '}} revision history + +
    • +
  • +   Lock for major revision +
    • + + +
  • +   Publish draft changes +
    • +
  • +   Discard draft changes +
    • +
  • -
  • -   Delete this profile -
    • - + +
  • +   Delete this profile +
    • +
  •   Archive this profile
    • -
  • -   Restore this profile -
    • + +
  • +   Restore this profile +
    • +     diff --git a/grails-app/views/profile/_publications.gsp b/grails-app/views/profile/_publications.gsp index 9aced6a2..9a777995 100644 --- a/grails-app/views/profile/_publications.gsp +++ b/grails-app/views/profile/_publications.gsp @@ -29,7 +29,7 @@
    - +
    -
    - -
    diff --git a/grails-app/conf/au/org/ala/profile/filter/AccessControlFilters.groovy b/grails-app/conf/au/org/ala/profile/filter/AccessControlFilters.groovy index 64a8ab54..811c2e9d 100644 --- a/grails-app/conf/au/org/ala/profile/filter/AccessControlFilters.groovy +++ b/grails-app/conf/au/org/ala/profile/filter/AccessControlFilters.groovy @@ -122,6 +122,8 @@ class AccessControlFilters { response.status = HttpStatus.SC_FORBIDDEN response.sendError(HttpStatus.SC_FORBIDDEN) } + + return authorised } else { boolean authenticated = authService.getDisplayName() != null params.isOpusAdmin = authenticated @@ -130,6 +132,7 @@ class AccessControlFilters { params.isOpusReviewer = authenticated params.isOpusUser = authenticated log.warn "**** Authorisation has been disabled! ****" + return true } } after = { Map model -> diff --git a/grails-app/controllers/au/org/ala/profile/hub/CommentController.groovy b/grails-app/controllers/au/org/ala/profile/hub/CommentController.groovy index 58fda2cb..6d8b64a8 100644 --- a/grails-app/controllers/au/org/ala/profile/hub/CommentController.groovy +++ b/grails-app/controllers/au/org/ala/profile/hub/CommentController.groovy @@ -48,16 +48,14 @@ class CommentController extends BaseController { } } - @Secured(role = Role.ROLE_PROFILE_REVIEWER) + @Secured(role = Role.ROLE_PROFILE_ADMIN) def deleteComment() { if (!params.commentId) { badRequest() - } else if (checkCommentPermissions(params.profileId, params.commentId)) { + } else { def response = profileService.deleteComment(params.opusId, params.profileId, params.commentId) handle response - } else { - notAuthorised() } } diff --git a/grails-app/controllers/au/org/ala/profile/hub/OpusController.groovy b/grails-app/controllers/au/org/ala/profile/hub/OpusController.groovy index 5f4e93bd..34f85028 100644 --- a/grails-app/controllers/au/org/ala/profile/hub/OpusController.groovy +++ b/grails-app/controllers/au/org/ala/profile/hub/OpusController.groovy @@ -326,7 +326,7 @@ class OpusController extends OpusBaseController { } } - @Secured(role = ROLE_PROFILE_ADMIN, opusSpecific = true) + @Secured(role = ROLE_ADMIN, opusSpecific = false) def deleteOpus() { if (!params.opusId) { badRequest "opusId is a required parameter" diff --git a/grails-app/views/layouts/_custom-bottom.gsp b/grails-app/views/layouts/_custom-bottom.gsp index 2de11a9f..e04bdd89 100644 --- a/grails-app/views/layouts/_custom-bottom.gsp +++ b/grails-app/views/layouts/_custom-bottom.gsp @@ -125,6 +125,8 @@ isOpusReviewer: ${!!params.isOpusReviewer}, isOpusAuthor: ${!!params.isOpusAuthor}, isOpusEditor: ${!!params.isOpusEditor}, + isOpusAdmin: ${!!params.isOpusAdmin}, + isALAAdmin: ${!!params.isALAAdmin}, listServiceUrl: '${grailsApplication.config.lists.base.url}', masterListType: '${grailsApplication.config.lists.masterlist.type ?: 'PROFILE' }', nslServiceUrlPrefix: '${grailsApplication.config.nsl.service.url.prefix}', diff --git a/grails-app/views/opus/_editAccessControl.gsp b/grails-app/views/opus/_editAccessControl.gsp index 6b5d1d77..79ee140a 100644 --- a/grails-app/views/opus/_editAccessControl.gsp +++ b/grails-app/views/opus/_editAccessControl.gsp @@ -34,12 +34,12 @@

    Assign users Admin, Editor or Author roles to this profile collection.

      -
    • Admin - can edit the configuration for the entire collection, and can modify any profile in the collection. +
    • Admin - can edit the configuration for the entire collection, and can create, modify, delete and publish any profile in the collection.
      • -
    • Editor - can add, edit, publish and delete any profile within this collection.
      • -
    • Author - can add and edit content on any profile page within this collection.
      • +
    • Author - can create and edit content on any profile page within this collection. Can also archive profiles.
      • +
    • Editor - can edit any profile within this collection, but not create profiles.
    • Reviewer - can view and add review comments on any profile page within this collection, but cannot create or modify profiles. -
    • User - can view any profile page within this private collection, but cannot create or modify profiles, and cannot comment on profiles. +
    • User - can view any profile page within this private collection, but cannot create or modify profiles, and cannot comment on profiles.
    diff --git a/grails-app/views/opus/edit.gsp b/grails-app/views/opus/edit.gsp index 9d837387..d26345e6 100644 --- a/grails-app/views/opus/edit.gsp +++ b/grails-app/views/opus/edit.gsp @@ -30,7 +30,7 @@ Public View - +