Merge branch 'release/5.3.6'

Author: patkyn

build.gradle

@@ -23,7 +23,7 @@ plugins {
     //    id "com.moowork.node" version "1.1.1"
 }
 
-version "5.3.5"
+version "5.3.6"
 group "au.org.ala"
 description "Digivol application"
 

grails-app/services/au/org/ala/volunteer/TaskService.groovy

@@ -828,7 +828,7 @@ ORDER BY record_idx, name;
      * @param fieldValues The field values to search for
      * @return A map of field value to task id
      */
-    Map<String, Long> findByProjectAndFieldValues(long projectId, String fieldName, Collection<String> fieldValues) {
+    Map<String, Long> findByProjectAndFieldValues(Long projectId, String fieldName, Collection<String> fieldValues) {
         if (fieldValues) {
             DSLContext create = jooqContext()
 

grails-app/taglib/au/org/ala/volunteer/TranscribeTagLib.groovy

@@ -687,6 +687,7 @@ class TranscribeTagLib {
     def taskSequence = { attrs, body ->
         Stopwatch sw = Stopwatch.createStarted()
         Task taskInstance = attrs.task
+        boolean isPreview = attrs.isPreview
         Project project = taskInstance.project
 
         Field field = null
@@ -704,7 +705,7 @@ class TranscribeTagLib {
             def sequenceNumber = attrs.number
 
             Map sequenceNumbers = sequenceNumbers(attrs)
-            List<String> allSeqNos = (sequenceNumbers.previous + sequenceNumbers.next)*.toString()
+            List<String> allSeqNos = !isPreview? (sequenceNumbers.previous + sequenceNumbers.next)*.toString() : []
             def seqToTaskId = taskService.findByProjectAndFieldValues(project.id, 'sequenceNumber', allSeqNos)
             def taskIds = seqToTaskId.values() + taskInstance.id
             Map<Long, Multimedia> taskIdToMM = multimediaService.findImagesForTasks(taskIds)

grails-app/views/transcribe/_cameraTrapImageSequence.gsp

@@ -1,5 +1,5 @@
 <div id="ct-image-sequence" class="film-strip">
-    <g:set var="tasks" value="${taskSequence(number: sequenceNumber, count: 3, task:taskInstance)}"/>
+    <g:set var="tasks" value="${taskSequence(number: sequenceNumber, count: 3, task:taskInstance, isPreview: isPreview)}"/>
     <g:each in="${tasks.previous}" var="task">
         <div class="film-cell" data-seq-no="${task.sequenceNumber}">
             <cl:multimediaThumbnail multimedia="${task.multimedia}" seqNo="${task.sequenceNumber}"/>

src/main/resources/db/migration/V202003251314006778__cleanup-index.sql

@@ -0,0 +1,2 @@
+
+DROP INDEX IF EXISTS transcription_task_project;