Merge pull request #1584 from AtlasOfLivingAustralia/hotfix/6.7.1

Hotfix/6.7.1 - Fixes #1577 & Erroneous dropzone call
AtlasOfLivingAustralia · Apr 18, 2024 · da643fc · da643fc
2 parents 22af54e + 4c5eea6
commit da643fc
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/grails-app/assets/javascripts/document.js b/grails-app/assets/javascripts/document.js
@@ -283,6 +283,7 @@ function attachViewModelToFileUpload(uploadUrl, documentViewModel, uiSelector, p
     $(uiSelector).fileupload({
         url:uploadUrl,
         pasteZone: null,
+        dropZone: null,
         formData:function(form) {
             return [{name:'document', value:documentViewModel.toJSONString()}]
         },

diff --git a/grails-app/assets/javascripts/knockout-custom-bindings.js b/grails-app/assets/javascripts/knockout-custom-bindings.js
@@ -281,6 +281,7 @@ ko.bindingHandlers.stagedImageUpload = {
         $(element).fileupload({
             url: config.url,
             pasteZone: null,
+            dropZone: null,
             autoUpload: true
         }).on('fileuploadadd', function (e, data) {
             complete(false);
@@ -703,11 +704,11 @@ ko.bindingHandlers.fileUploadNoImage = {
 
         var defaults = {autoUpload: true};
         var settings = {
-            pasteZone: null
+            pasteZone: null,
+            dropZone: null
         };
         $.extend(settings, defaults, options());
-        $(element).fileupload(settings
-        ).on('fileuploadadd', function (e, data) {
+        $(element).fileupload(settings).on('fileuploadadd', function (e, data) {
             window.incrementAsyncCounter && window.incrementAsyncCounter();
         }).on('fileuploaddone', function (e, data) {
             window.decreaseAsyncCounter && window.decreaseAsyncCounter();

diff --git a/grails-app/assets/javascripts/outputs.js b/grails-app/assets/javascripts/outputs.js
@@ -152,6 +152,7 @@ ko.bindingHandlers.photoPointUpload = {
         $(element).fileupload({
             url:config.url,
             pasteZone: null,
+            dropZone: null,
             autoUpload:true
         }).on('fileuploadadd', function(e, data) {
             complete(false);
@@ -360,6 +361,7 @@ ko.bindingHandlers.fileUploadWithProgress = {
         $(element).fileupload({
             url: config.url,
             pasteZone: null,
+            dropZone: null,
             autoUpload: true
         }).on('fileuploadadd', function (e, data) {
             complete(false);

diff --git a/grails-app/services/au/org/ala/biocollect/merit/ActivityService.groovy b/grails-app/services/au/org/ala/biocollect/merit/ActivityService.groovy
@@ -116,9 +116,9 @@ class ActivityService {
         webService.doDelete(grailsApplication.config.ecodata.service.url + '/activity/' + id)
     }
 
-    def bulkDelete(List ids, boolean destory) {
+    def bulkDelete(List ids, boolean destroy = false) {
         String url = grailsApplication.config.ecodata.service.url + '/activityBulkDelete'
-        if(destory)
+        if(destroy)
             url += '?destroy=true'
         webService.doPost(url, [ids: ids])
     }