Merge pull request #3001 from AtlasOfLivingAustralia/hotfix/3.0.1

Allow org admin/editor to attach docs to reports #3000
AtlasOfLivingAustralia · Oct 12, 2023 · bf87bc4 · bf87bc4
2 parents 9349b2f + f1d01bd
commit bf87bc4
Show file tree

Hide file tree

Showing 10 changed files with 156 additions and 116 deletions.
diff --git a/build.gradle b/build.gradle
@@ -186,7 +186,7 @@ dependencies {
     providedCompile "io.methvin:directory-watcher:0.4.0"
 
     if (!Boolean.valueOf(inplace)) {
-        implementation "org.grails.plugins:ecodata-client-plugin:6.1"
+        implementation "org.grails.plugins:ecodata-client-plugin:6.1.2"
     }
 }
 

diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-meritVersion=3.0
+meritVersion=3.0.1-SNAPSHOT
 grailsVersion=5.3.2
 grailsGradlePluginVersion=5.3.0
 groovyVersion=3.0.11

diff --git a/grails-app/services/au/org/ala/merit/DocumentService.groovy b/grails-app/services/au/org/ala/merit/DocumentService.groovy
@@ -186,7 +186,7 @@ class DocumentService {
         } else if (document.programId) {
             canEdit = userService.canUserEditProgramReport(userId, document.programId)
         } else if (document.organisationId) {
-            canEdit = userService.isUserAdminForOrganisation(userId, document.organisationId)
+            canEdit = userService.isUserEditorForOrganisation(userId, document.organisationId)
         } else if (document.activityId) {
             canEdit = userService.canUserEditActivity(userId, document.activityId)
         } else if (document.managementUnitId) {

diff --git a/grails-app/views/activity/activityReport.gsp b/grails-app/views/activity/activityReport.gsp
@@ -226,13 +226,15 @@
 
             var activityId = '${activity.activityId}';
             var projectId = '${activity.projectId}';
+            var documentOwner = <fc:modelAsJavascript model="${documentOwner}" default="null"/>;
 
             var outputModelConfig = {
                 activityId: activityId,
                 projectId: projectId,
                 disablePrepop: false,
                 speciesConfig:<fc:modelAsJavascript model="${speciesConfig}"/>,
-                recoveryDataStorageKey: recoveryDataStorageKey
+                recoveryDataStorageKey: recoveryDataStorageKey,
+                documentOwner: documentOwner
             };
             outputModelConfig = _.extend(fcConfig, outputModelConfig);