#242 update tasks/all and tasks/index pages

Author: Adam Collins

grails-app/controllers/au/org/ala/spatial/TasksController.groovy

@@ -407,13 +407,11 @@ class TasksController {
         t.history.each { it -> it }
         t.output.each { it -> it }
         t.input.each { it -> it }
-        def task = tasksService.reRun(t)
 
-        if (task) {
-            render task as JSON
-        } else {
-            redirect(action: "index", params: params)
-        }
+        tasksService.reRun(t)
+
+        params.remove('id')
+        redirect(action: "index", params: params)
     }
 
     /**

grails-app/views/tasks/all.gsp

@@ -110,7 +110,7 @@
 
         <g:sortableColumn property="history"
                           title="${message(code: 'task.history.label', default: 'History (last 4 entries)')}"/>
-        <td><i class="fa fa-user"></i></td>
+        <td>userId</td>
         <th></th>
         </thead>
         <tbody>
@@ -135,9 +135,7 @@
                     <g:formatDate date="${h.key}" format="dd/MM/yy hh:mm:ss"/>=${h.value}<br/>
                 </g:each></td>
 
-                <td><g:link action="getUserById"
-                            id="${taskInstance.userId}"><g:if
-                            test="${taskInstance?.email != "null"}">${taskInstance?.email}</g:if><g:else>${taskInstance?.userId}</g:else></g:link></td>
+                <td>${taskInstance?.userId}</td>
 
                 <td><g:link action="reRun" class="btn btn-sm btn-default" id="${taskInstance.id}"
                             params="${params}">re-run task</g:link>
@@ -150,7 +148,7 @@
     </table>
 
     <div class="pagination">
-        <g:paginate total="${taskInstanceCount ?: 0}" params="${params}"/>
+        <g:paginate total="${taskInstanceCount ?: 0}" params="${params}" action="all"/>
     </div>
 </div>
 </body>

grails-app/views/tasks/index.gsp

@@ -111,7 +111,7 @@
 
         <g:sortableColumn property="history"
                           title="${message(code: 'task.history.label', default: 'History (last 4 entries)')}"/>
-        <td><i class="fa fa-user"></i></td>
+        <td>userId</td>
         <th></th>
         </thead>
         <tbody>
@@ -136,9 +136,7 @@
                     <g:formatDate date="${h.key}" format="dd/MM/yy hh:mm:ss"/>=${h.value}<br/>
                 </g:each></td>
 
-                <td><g:link action="getUserById"
-                            id="${taskInstance.userId}"><g:if
-                            test="${taskInstance?.email != "null"}">${taskInstance?.email}</g:if><g:else>${taskInstance?.userId}</g:else></g:link></td>
+                <td>${taskInstance?.userId}</td>
 
                 <td><g:link action="reRun" class="btn btn-sm btn-default" id="${taskInstance.id}"
                             params="${params}">re-run task</g:link>