Merge remote-tracking branch 'origin/dev' into feature/issue3466

Author: chrisala

forms/nht/grantsAndOthersProgressReport.json

@@ -986,7 +986,7 @@ class ProjectController {
         render results as JSON
     }
 
-    @PreAuthorise
+    @PreAuthorise(accessLevel = 'readOnly')
     def scoresForReport(String id) {
         List scoreIds = params.getList('scoreIds')
         String reportId = params.get('reportId')
@@ -996,7 +996,7 @@ class ProjectController {
         render result as JSON
     }
 
-    @PreAuthorise(accessLevel = 'editor')
+    @PreAuthorise(accessLevel = 'readOnly')
     def projectTargetsAndScores(String id) {
         boolean approvedDataOnly = params.getBoolean("approvedDataOnly", true)
         Map result = projectService.getServiceDashboardData(id, approvedDataOnly)
@@ -1026,7 +1026,7 @@ class ProjectController {
         render response as JSON
     }
 
-    @PreAuthorise(accessLevel = 'editor')
+    @PreAuthorise(accessLevel = 'readOnly')
     def targetsAndScoresForActivity(String id, String activityId) {
         if (!id || !activityId || !projectService.doesActivityBelongToProject(id, activityId)) {
             error('An invalid activity was selected', id)
@@ -1128,19 +1128,19 @@ class ProjectController {
      * @param id the project id of the project of interest
      * @return a List of outcomes selected in the project MERI plan
      */
-    @PreAuthorise(accessLevel = 'editor')
+    @PreAuthorise(accessLevel = 'readOnly')
     def listProjectInvestmentPriorities(String id) {
         List investmentPriorities = projectService.listProjectInvestmentPriorities(id)
         investmentPriorities <<  "Other"
         render investmentPriorities as JSON
     }
 
-    @PreAuthorise(accessLevel = 'editor')
+    @PreAuthorise(accessLevel = 'readOnly')
     def projectPrioritiesByOutcomeType(String id) {
         render projectService.projectPrioritiesByOutcomeType(id) as JSON
     }
 
-    @PreAuthorise(accessLevel = 'editor')
+    @PreAuthorise(accessLevel = 'readOnly')
     def monitoringProtocolFormCategories() {
         String MONITORING_TAG = 'survey'
         List<Map> forms = activityService.monitoringProtocolForms()
@@ -1150,7 +1150,7 @@ class ProjectController {
         render categories as JSON
     }
 
-    @PreAuthorise(accessLevel = 'editor')
+    @PreAuthorise(accessLevel = 'readOnly')
     def outcomesByScores(String id) {
         List scoreIds = params.getList('scoreIds')
         if (!scoreIds) {

forms/nht/procurementsOutputReport.json

@@ -9,6 +9,7 @@ import com.drew.metadata.exif.GpsDirectory
 import groovy.util.logging.Slf4j
 import groovyx.net.http.HttpResponseDecorator
 import grails.core.GrailsApplication
+import org.apache.http.HttpStatus
 
 @Slf4j
 class ImageService {
@@ -23,14 +24,14 @@ class ImageService {
      * @return true if the thumbail was generated.
      */
     boolean createThumbnail(InputStream imageIn, File thumbnailFile, String contentType, int size = 300) {
-        Closure saveThumbnail = { HttpResponseDecorator resp, Object parsedData ->
-            if (parsedData instanceof InputStream) {
-                new FileOutputStream(thumbnailFile).withStream { it << parsedData }
+
+        Map resp = webService.postMultipart(grailsApplication.config.getProperty('ecodata.baseUrl') + "document/createThumbnail", [size: size], imageIn, contentType, thumbnailFile.name, 'image')
+        if (resp.statusCode == HttpStatus.SC_OK) {
+            def thumbnailData = resp.resp
+            if (thumbnailData instanceof byte[]) {
+                new FileOutputStream(thumbnailFile).withStream { it << new ByteArrayInputStream(thumbnailData) }
             }
         }
-
-        webService.postMultipart(grailsApplication.config.getProperty('ecodata.baseUrl') + "document/createThumbnail", [size: size], imageIn, contentType, thumbnailFile.name, 'image', saveThumbnail)
-
         return thumbnailFile.exists()
 
     }

grails-app/controllers/au/org/ala/merit/ProjectController.groovy

@@ -16,7 +16,9 @@ class ConfigurableMeriPlanSpec extends StubbedCasSpec {
         loginAsAlaAdmin(browser)
         to AdminClearCachePage
         clearProgramListCache()
+        at AdminClearCachePage // reset at check time.
         clearServiceListCache()
+        at AdminClearCachePage // reset at check time.
         clearProtocolListCache()
     }
 

grails-app/services/au/org/ala/merit/ImageService.groovy

@@ -20,7 +20,7 @@ class HelpLinksSpec extends StubbedCasSpec {
 
         when: "Clear the help links cache as other specs will have run caching zero links"
         to AdminClearCachePage
-        homePageDocuments.click()
+        clearHomePageDocuments()
         logout(browser)
 
         then:

src/integration-test/groovy/au/org/ala/fieldcapture/ConfigurableMeriPlanSpec.groovy

@@ -13,14 +13,10 @@ class OrganisationDocumentsSpec extends StubbedCasSpec {
         loginAsAlaAdmin(browser)
         to AdminClearCachePage
         clearProgramListCache()
+        at AdminClearCachePage // reset at check time
         clearServiceListCache()
     }
 
-    def cleanup() {
-        logout(browser)
-    }
-
-
     def "documents can be attached to a organisation"() {
 
         setup:

src/integration-test/groovy/au/org/ala/fieldcapture/HelpLinksSpec.groovy

@@ -52,4 +52,12 @@ class AdminClearCachePage extends ReloadablePage {
             waitFor { hasBeenReloaded() }
         }
     }
+
+    void clearHomePageDocuments() {
+        if (homePageDocuments.displayed) {
+            homePageDocuments.click()
+
+            waitFor { hasBeenReloaded() }
+        }
+    }
 }