diff --git a/application.properties b/application.properties index ad2bb6b4..28410b73 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 diff --git a/grails-app/assets/javascripts/profileEditor/controllers/CreateProfileController.js b/grails-app/assets/javascripts/profileEditor/controllers/CreateProfileController.js index 0b635b46..e5ef0868 100644 --- a/grails-app/assets/javascripts/profileEditor/controllers/CreateProfileController.js +++ b/grails-app/assets/javascripts/profileEditor/controllers/CreateProfileController.js @@ -1,7 +1,7 @@ /** * Controller for handling creating a new profile (via a modal popup) */ -profileEditor.controller('CreateProfileController', function (profileService, $modalInstance, opusId, duplicateExisting) { +profileEditor.controller('CreateProfileController', function (profileService, messageService, $modalInstance, opusId, duplicateExisting) { var self = this; self.opusId = opusId; @@ -44,14 +44,18 @@ profileEditor.controller('CreateProfileController', function (profileService, $m }; self.searchByScientificName = function () { - var searchResult = profileService.profileSearch(self.opusId, self.profileToCopy, true); - searchResult.then(function (data) { - self.profiles = data; - }, - function () { - messageService.alert("Failed to perform search for '" + self.searchTerm + "'."); - } - ); + if (!self.profileToCopy || self.profileToCopy === undefined || self.profileToCopy.length <= 0) { + self.profiles = []; + } else { + var searchResult = profileService.profileSearch(self.opusId, self.profileToCopy, true); + searchResult.then(function (data) { + self.profiles = data; + }, + function () { + messageService.alert("Failed to perform search for '" + self.searchTerm + "'."); + } + ); + } }; self.valid = function() { diff --git a/grails-app/assets/javascripts/profileEditor/controllers/MapController.js b/grails-app/assets/javascripts/profileEditor/controllers/MapController.js index a8e3a833..48721616 100644 --- a/grails-app/assets/javascripts/profileEditor/controllers/MapController.js +++ b/grails-app/assets/javascripts/profileEditor/controllers/MapController.js @@ -303,7 +303,8 @@ profileEditor.controller('MapController', function ($scope, profileService, util point: { colour: self.opus.mapConfig.mapPointColour, mapAttribution: self.opus.mapConfig.mapAttribution - } + }, + facetGroupUrl: config.facetGroupUrl } ); diff --git a/grails-app/assets/javascripts/profileEditor/controllers/PublicationController.js b/grails-app/assets/javascripts/profileEditor/controllers/PublicationController.js index b7b57517..c66afd73 100644 --- a/grails-app/assets/javascripts/profileEditor/controllers/PublicationController.js +++ b/grails-app/assets/javascripts/profileEditor/controllers/PublicationController.js @@ -25,7 +25,7 @@ profileEditor.controller('PublicationController', function (profileService, util promise.then(function () { loadPublications(); }, function () { - messageService.alert("An error occurred while creating the snapshot."); + messageService.alertStayOn("An error occurred while creating the snapshot. The error might be due to profile not having an author."); }); }); }; diff --git a/grails-app/assets/javascripts/profileEditor/directives/masterList.js b/grails-app/assets/javascripts/profileEditor/directives/masterList.js index 5e47274f..a22109dc 100644 --- a/grails-app/assets/javascripts/profileEditor/directives/masterList.js +++ b/grails-app/assets/javascripts/profileEditor/directives/masterList.js @@ -75,6 +75,7 @@ function checkMasterlistSyncStatus() { $log.debug("Chceking masterlist sync status"); + if (!self.opus.uuid) return; profileService.isMasterListSyncing(self.opus.uuid) .then(function(res) { self.isMasterListSyncing = res.response; diff --git a/grails-app/assets/javascripts/profileEditor/directives/vocabularyEditor.js b/grails-app/assets/javascripts/profileEditor/directives/vocabularyEditor.js index c8190eca..261ba708 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 = []; + 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/commentContent.tpl.htm b/grails-app/assets/javascripts/profileEditor/templates/commentContent.tpl.htm index b956c271..988ab90e 100644 --- a/grails-app/assets/javascripts/profileEditor/templates/commentContent.tpl.htm +++ b/grails-app/assets/javascripts/profileEditor/templates/commentContent.tpl.htm @@ -9,11 +9,12 @@ -
- -
diff --git a/grails-app/assets/javascripts/profileEditor/templates/nomenclature.tpl.htm b/grails-app/assets/javascripts/profileEditor/templates/nomenclature.tpl.htm index 14a65c01..46190f6f 100644 --- a/grails-app/assets/javascripts/profileEditor/templates/nomenclature.tpl.htm +++ b/grails-app/assets/javascripts/profileEditor/templates/nomenclature.tpl.htm @@ -28,8 +28,8 @@
-   -
+   +
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. +

diff --git a/grails-app/assets/stylesheets/mergedProfilesThemeColour.scss b/grails-app/assets/stylesheets/mergedProfilesThemeColour.scss index 2da6a68c..f46195b8 100644 --- a/grails-app/assets/stylesheets/mergedProfilesThemeColour.scss +++ b/grails-app/assets/stylesheets/mergedProfilesThemeColour.scss @@ -1349,7 +1349,11 @@ hr.comment-divider { .nomenclature .concept { font-weight: bold; - display: inline-block; +} + +.nomenclature .btn { + white-space: normal; + text-align: start; } .nomenclature a, .nomenclature a:focus, .nomenclature a:hover { 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(); 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") { diff --git a/grails-app/conf/UrlMappings.groovy b/grails-app/conf/UrlMappings.groovy index f2edb868..d139624c 100644 --- a/grails-app/conf/UrlMappings.groovy +++ b/grails-app/conf/UrlMappings.groovy @@ -223,6 +223,7 @@ class UrlMappings { "/opus/$opusId/profile/$profileId/image/$imageId/tile/$zoom/$x/$y" controller: "image", action: [GET: "getTile"] "/stylesheet/$id?" controller: "stylesheet", action: "opus" + "/facets" controller: "resource", action: "facets" if (Environment.current == Environment.DEVELOPMENT) { "/console/$action?/$id?(.$format)?" controller: 'console' } 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..811c2e9d 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 @@ -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/conf/grouped_facets_ala.json b/grails-app/conf/grouped_facets_ala.json new file mode 100644 index 00000000..3e54ddc6 --- /dev/null +++ b/grails-app/conf/grouped_facets_ala.json @@ -0,0 +1,115 @@ +[ + { + "title":"Taxon", + "facets":[ + { + "sort":"index", + "field":"taxon_name" + }, + { + "sort":"index", + "field":"subspecies_name" + }, + { + "sort":"index", + "field":"species" + }, + { + "sort":"index", + "field":"genus" + }, + { + "sort":"index", + "field":"family" + }, + { + "sort":"index", + "field":"order" + }, + { + "sort":"index", + "field":"class" + }, + { + "sort":"index", + "field":"phylum" + }, + { + "sort":"index", + "field":"kingdom" + }, + { + "sort":"index", + "field":"common_name" + }, + { + "sort":"count", + "field":"species_subgroup" + } + ] + }, + { + "title":"Occurrence", + "facets":[ + { + "sort":"index", + "field":"month" + }, + { + "sort":"index", + "field":"year" + } + ] + }, + { + "title":"Location", + "facets":[ + { + "sort":"index", + "field":"country" + }, + { + "sort":"count", + "field":"state" + }, + { + "sort":"count", + "field": "cl1048" + }, + { + "sort":"count", + "field": "cl1049" + } + ] + }, + { + "title":"Record", + "facets":[ + { + "sort":"index", + "field":"basis_of_record" + }, + { + "sort":"count", + "field":"multimedia" + }, + { + "sort":"index", + "field":"occurrence_status" + } + ] + }, + { + "title":"Attribution", + "facets":[ + { + "sort":"count", + "field":"alau_user_id" + }, + { + "sort":"count", + "field":"data_resource_uid" + } + ] + } +] \ No newline at end of file diff --git a/grails-app/conf/reports/profiles/PROFILES_detail.jrxml b/grails-app/conf/reports/profiles/PROFILES_detail.jrxml index 40a6cdc7..baf49330 100644 --- a/grails-app/conf/reports/profiles/PROFILES_detail.jrxml +++ b/grails-app/conf/reports/profiles/PROFILES_detail.jrxml @@ -238,6 +238,7 @@ + )$P{REPORT_TEMPLATES}]]> 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 a9955ffc..34f85028 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) 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..4b8c51fb 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" @@ -106,7 +104,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def updateProfile() { def json = request.getJSON() log.debug("updateProfile with json " + json + " for profile " + params.profileId) @@ -121,7 +119,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def renameProfile() { def json = request.getJSON() if (!params.opusId || !params.profileId || !json) { @@ -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() @@ -170,7 +168,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def publishPrivateImage() { if (!params.opusId || !params.profileId || !params.imageId) { badRequest() @@ -181,7 +179,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def updateLocalImageMetadata() { def metadata = request.getJSON() if (!params.imageId || !metadata) { @@ -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" @@ -262,7 +260,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def updateBHLLinks() { def jsonRequest = request.getJSON() @@ -276,7 +274,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def updateLinks() { def jsonRequest = request.getJSON() @@ -291,7 +289,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def updateAttribute() { log.debug "Updating attribute....." def jsonRequest = request.getJSON() @@ -306,7 +304,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def deleteAttribute() { if (!params.attributeId || !params.profileId) { badRequest "attributeId and profileId are required parameters" @@ -358,7 +356,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def uploadImage() { if (!params.opusId || !params.profileId || !params.dataResourceId || !params.title) { badRequest "opusId, dataResourceId, title and profileId are mandatory fields" @@ -393,7 +391,7 @@ class ProfileController extends BaseController { handle response } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def deleteLocalImage() { if (!params.opusId || !params.profileId || !params.imageId || !params.type) { badRequest "opusId, profileId, imageId and type 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" @@ -607,7 +605,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def updateAuthorship() { def json = request.getJSON() @@ -660,7 +658,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def saveAttachment() { if (!params.opusId || !params.profileId || !(request instanceof MultipartHttpServletRequest) || !request.getParameter("data")) { badRequest "opusId and profile are required parameters, a JSON data paramaeter must be provided, and the request must be a multipart request" @@ -683,7 +681,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def deleteAttachment() { if (!params.opusId || !params.profileId || !params.attachmentId) { badRequest "opusId, profileId and attachmentId are required parameters" @@ -707,7 +705,7 @@ class ProfileController extends BaseController { } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def createMapSnapshot(@NotNull String opusId, @NotNull String profileId) { Map json = request.getJSON() String occurrenceQuery = json?.occurrenceQuery @@ -723,7 +721,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def deleteMapSnapshot(@NotNull String opusId, @NotNull String profileId) { def opusAndProfile = profileService.getProfile(opusId, profileId) if (!opusAndProfile || !opusAndProfile.profile) { @@ -814,7 +812,7 @@ class ProfileController extends BaseController { * @param documentId the documentId of the document to update (if not supplied, a create operation will be assumed). * @return the result of the update. */ - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def documentUpdate(String documentId) { log.debug("In documentUpdate for ID: ${documentId}") @@ -843,7 +841,7 @@ class ProfileController extends BaseController { * @param documentId the documentId of the document to delete. * @return the result of the deletion. */ - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def documentDelete(String documentId) { log.debug("In documentDelete for ID: ${documentId}") @@ -857,7 +855,7 @@ class ProfileController extends BaseController { render status: result.statusCode } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def setPrimaryMultimedia() { log.debug("setPrimaryMultimedia()") @@ -878,7 +876,7 @@ class ProfileController extends BaseController { } } - @Secured(role = ROLE_PROFILE_AUTHOR) + @Secured(role = ROLE_PROFILE_EDITOR) def setStatus() { log.debug('setStatus()') diff --git a/grails-app/controllers/au/org/ala/profile/hub/ResourceController.groovy b/grails-app/controllers/au/org/ala/profile/hub/ResourceController.groovy new file mode 100644 index 00000000..76ab02bb --- /dev/null +++ b/grails-app/controllers/au/org/ala/profile/hub/ResourceController.groovy @@ -0,0 +1,21 @@ +package au.org.ala.profile.hub + +import com.google.common.io.Resources + +class ResourceController { + + String facets + + def facets() { + if (!facets) { + if (grailsApplication.config.facets) { + facets = new File(grailsApplication.config.facets).text + } else { + facets = Resources.getResource('grouped_facets_ala.json').text + } + } + + response.contentType = 'application/json' + render facets + } +} 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 diff --git a/grails-app/services/au/org/ala/profile/hub/ImageService.groovy b/grails-app/services/au/org/ala/profile/hub/ImageService.groovy index 3a415772..7ccc15dd 100644 --- a/grails-app/services/au/org/ala/profile/hub/ImageService.groovy +++ b/grails-app/services/au/org/ala/profile/hub/ImageService.groovy @@ -387,12 +387,6 @@ class ImageService { Map response = [:] List allImages = [] - def publishedImagesMap = biocacheService.retrieveImages(searchIdentifier, opus) - if (publishedImagesMap?.resp?.occurrences?.size() > 0) { - List publishedImageList = prepareImagesForDisplay(publishedImagesMap, opus, profile, readonlyView) - allImages.addAll(publishedImageList) - } - //we want to display the images in a specific order - staged, private, published if (profile.privateMode && profile.stagedImages) { allImages.addAll(convertLocalImages(profile.stagedImages, opus, profile, ImageType.STAGED, useInternalPaths, readonlyView)) @@ -404,6 +398,12 @@ class ImageService { allImages.addAll(convertLocalImages(profile.privateImages ?: [], opus, profile, ImageType.PRIVATE, useInternalPaths, readonlyView)) } + def publishedImagesMap = biocacheService.retrieveImages(searchIdentifier, opus) + if (publishedImagesMap?.resp?.occurrences?.size() > 0) { + List publishedImageList = prepareImagesForDisplay(publishedImagesMap, opus, profile, readonlyView) + allImages.addAll(publishedImageList) + } + response.statusCode = SC_OK response.resp = allImages diff --git a/grails-app/services/au/org/ala/profile/hub/ProfileService.groovy b/grails-app/services/au/org/ala/profile/hub/ProfileService.groovy index 460226f7..18fa40f3 100644 --- a/grails-app/services/au/org/ala/profile/hub/ProfileService.groovy +++ b/grails-app/services/au/org/ala/profile/hub/ProfileService.groovy @@ -211,13 +211,13 @@ class ProfileService { } } - def proxyAttachmentDownload(HttpServletResponse response, String opusId, String profileId, String attachmendId) { - log.debug("Proxying attachment download $attachmendId") + def proxyAttachmentDownload(HttpServletResponse response, String opusId, String profileId, String attachmentId) { + log.debug("Proxying attachment download $attachmentId") if (profileId) { webService.proxyGetRequest(response, "${grailsApplication.config.profile.service.url}/opus/${encPath(opusId)}/profile/${encPath(profileId)}/attachment/${encPath(attachmentId)}/download?latest=true") } else { - webService.proxyGetRequest(response, "${grailsApplication.config.profile.service.url}/opus/${encPath(opusId)}/attachment/${encPath(attachmendId)}/download") + webService.proxyGetRequest(response, "${grailsApplication.config.profile.service.url}/opus/${encPath(opusId)}/attachment/${encPath(attachmentId)}/download") } } 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/layouts/_custom-bottom.gsp b/grails-app/views/layouts/_custom-bottom.gsp index 2de11a9f..174d9c03 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}', @@ -137,7 +139,8 @@ bootstrapCssFile: '${assetPath(src: "/bootstrap/css/bootstrap3.3.4.min.css")}', imageLoadErrorUrl: '${assetPath(src: "not-available.png")}', development: ${Environment.current == Environment.DEVELOPMENT}, - pdfHighThresholdLimit : '${grailsApplication.config.pdf.highThresholdLimit?:50}' + pdfHighThresholdLimit : '${grailsApplication.config.pdf.highThresholdLimit?:50}', + facetGroupUrl: '${g.createLink(controller: 'resource', action: 'facets')}' }); 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/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 - +
    • - -
  • -   {{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 @@
    - +