Merge branch 'hotfix/5.2.4'

build.gradle

@@ -15,7 +15,7 @@ buildscript {
 plugins {
     id 'war'
 }
-version "5.2.3"
+version "5.2.4-SNAPSHOT"
 
 group "au.org.ala"
 

grails-app/assets/javascripts/activity.js

@@ -219,7 +219,7 @@ var ActivitiesAndRecordsViewModel = function (placeHolder, view, user, ignoreMap
         var elem = event.target ? event.target : event.srcElement;
         var asyncDownloadThreshold = DEFAULT_EMAIL_DOWNLOAD_THRESHOLD;
         if (elem) {
-                asyncDownloadThreshold = $(elem).attr("dataemailthreshold");
+                asyncDownloadThreshold = $(elem).data("email-threshold");
         }
 
         var url = constructQueryUrl(fcConfig.downloadProjectDataUrl, 0, false);

grails-app/controllers/au/org/ala/biocollect/DownloadController.groovy

@@ -20,6 +20,7 @@ class DownloadController {
         } else {
             String fileExtension = params.fileExtension ?: 'zip'
             webService.proxyGetRequest(response, "${grailsApplication.config.ecodata.service.url}/search/downloadProjectDataFile/${params.id}?fileExtension=${fileExtension}", true, true)
+            return null
         }
     }
 

src/test/groovy/au/org/ala/biocollect/DownloadControllerSpec.groovy

@@ -1,5 +1,6 @@
 package au.org.ala.biocollect
 
+import au.org.ala.biocollect.merit.WebService
 import grails.test.mixin.TestFor
 import org.apache.http.HttpStatus
 import spock.lang.Specification
@@ -17,6 +18,7 @@ class DownloadControllerSpec extends Specification {
     File hubPath
     File modelPath
     File configPath
+    WebService webService
 
     void setup() {
 
@@ -32,6 +34,7 @@ class DownloadControllerSpec extends Specification {
         configPath.mkdir()
 
         controller.grailsApplication.config.app.file.script.path = scriptsPath.getAbsolutePath()
+        controller.grailsApplication.config.ecodata.service.url = ""
 
         // Setup three files, one that should be accessible, and others that should not
         File validFile =  new File(modelPath, "validFile.js")
@@ -145,4 +148,24 @@ class DownloadControllerSpec extends Specification {
         new File("${scriptsPath}${File.separator}${params.hub}${File.separator}${params.model}", params.filename).exists()
         response.status == HttpStatus.SC_NOT_FOUND
     }
+
+    def "Data can be downloaded for a created file if id and file extension is provided"(String inputFormat, String expectedOutputFormat) {
+        setup:
+        String projectId = 'p1'
+        controller.webService = webService = Mock(WebService)
+
+        when:
+        params.id = projectId
+        params.fileExtension = inputFormat
+        Map result = controller.downloadProjectDataFile()
+
+        then:
+        1 * webService.proxyGetRequest(response, '/search/downloadProjectDataFile/'+projectId+'?fileExtension='+expectedOutputFormat, true, true)
+        result == null
+
+        where:
+        inputFormat | expectedOutputFormat
+        'zip'       | 'zip'
+        ''          | 'zip'
+    }
 }