Merge pull request #1594 from AtlasOfLivingAustralia/hotfix/6.8.1

Hotfix/6.8.1

Author: jack-brinkman

gradle.properties

@@ -1,4 +1,4 @@
-biocollectVersion=6.8
+biocollectVersion=6.8.1-SNAPSHOT
 grailsVersion=5.1.9
 grailsGradlePluginVersion=5.1.5
 assetPipelineVersion=3.3.4

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

@@ -65,15 +65,15 @@ class ReferenceAssessmentController {
         ]
 
         // Create the new assessment activity record
-        activityService.update("", assessActivity)
+        def outActivity = activityService.update("", assessActivity)
 
         // Update the numTimesReferenced field on the reference record
         referenceActivity.outputs[0].data.numTimesReferenced =
                 referenceActivity.outputs[0].data.numTimesReferenced as Integer + 1
         activityService.update(referenceActivity.activityId, referenceActivity)
 
         // Return the assessment activity
-        assessActivity
+        outActivity
     }
 
     def requestRecords() {

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

@@ -17,7 +17,7 @@ class StaticPageController {
             String setting = "${page}";
             render view: 'index', model: ["setting": setting, "mobile": params.mobile ?:false];
         } else {
-            render view: "404";
+            render view:'/404'
         }
     }
 

grails-app/taglib/au/org/ala/biocollect/TemplateTagLib.groovy

@@ -337,7 +337,8 @@ class TemplateTagLib {
     }
 
     String getCurrentURLFromRequest() {
-        grailsLinkGenerator.link(absolute: true, params: request.params, uri: request.forwardURI)
+        def grailsRequest = GrailsWebRequest.lookup()
+        grailsLinkGenerator.link(absolute: true, params: grailsRequest.originalParams, uri: request.forwardURI)
     }
 
 

src/main/scripts/releases/6.8.1/addStaticReferenceAssessmentPageHCAT.js

@@ -0,0 +1,19 @@
+const fs = require('fs');
+
+const pageContent = fs.readFileSync('./html/ref-assess-static.html', 'utf8');
+
+db.setting.updateOne(
+    { key: 'hcat.Request_Assessment_Records' },
+    {
+        $set: {
+            key: 'hcat.Request_Assessment_Records',
+            value: pageContent.replaceAll('\n', '\r\n'),
+            version: NumberLong(1)
+        },
+        $currentDate: {
+            lastUpdated: true,
+            dateCreated: true
+        },
+    },
+    { upsert: true }
+);