Merge remote-tracking branch 'origin/master' into dev

AtlasOfLivingAustralia · Oct 12, 2023 · 9f69b98 · 9f69b98
2 parents f584dbe + cc4195e
commit 9f69b98
Show file tree

Hide file tree

Showing 2 changed files with 67 additions and 50 deletions.
diff --git a/grails-app/assets/javascripts/forms.js b/grails-app/assets/javascripts/forms.js
@@ -1389,10 +1389,11 @@ function orEmptyArray(v) {
 
         self.attachDocument = function (target) {
             var url = config.documentUpdateUrl || fcConfig.documentUpdateUrl;
+            var documentOwner = config.documentOwner || {activityId: activityId, projectId: config.projectId};
             showDocumentAttachInModal(url, new DocumentViewModel({
                 role: 'information',
                 stage: config.stage
-            }, {activityId: activityId, projectId: config.projectId}), '#attachDocument')
+            }, documentOwner), '#attachDocument')
                 .done(function (result) {
                     // checking documentid to void adding empty document into the attachment table
                     // documentid only return true if document is successfully save

diff --git a/package-lock.json b/package-lock.json