Merge pull request #239 from AtlasOfLivingAustralia/234-datatable-usage

#232 disable DataTable pagination
AtlasOfLivingAustralia · Apr 18, 2024 · c1e8be2 · c1e8be2
2 parents 8e55134 + 0a28b26
commit c1e8be2
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/grails-app/views/manage/externalLoadReview.gsp b/grails-app/views/manage/externalLoadReview.gsp
@@ -82,7 +82,7 @@
                     </tbody>
                 </table>
                 <div>
-                <span class="button"><g:actionSubmit class="save btn btn-warning" controller="manage" action="updateFromExternalSources" value="${message(code: 'default.button.load.label', default: 'Load')}" onclick="return confirm('${message(code: 'default.button.load.confirm.message', default: 'Are you sure?')}');" /></span>
+                <span class="button"><g:actionSubmit class="save btn btn-warning" controller="manage" action="updateFromExternalSources" value="${message(code: 'default.button.load.label', default: 'Load')}" onclick="${'$'}('#resource-table').DataTable().search('').draw(); return confirm('${message(code: 'default.button.load.confirm.message', default: 'Are you sure?')}');" /></span>
                 </div>
          </div>
     </g:form>
@@ -128,7 +128,8 @@
                 {"orderable": false},
                 {"orderable": false},
                 {"orderable": false}
-            ]
+            ],
+            paging: false
         });
     } );
 
@@ -173,4 +174,4 @@
     };
 </script>
 </body>
-</html>
+</html>
diff --git a/grails-app/views/manage/repatriateReview.gsp b/grails-app/views/manage/repatriateReview.gsp
@@ -88,7 +88,7 @@
         </table>
         <div>
             <g:if test="${configuration.resources}">
-                <span class="button"><g:actionSubmit class="save btn btn-warning" controller="manage" action="updateFromExternalSources" value="${message(code: 'default.button.load.label', default: 'Load')}" onclick="return confirm('${message(code: 'default.button.load.confirm.message', default: 'Are you sure?')}');" /></span>
+                <span class="button"><g:actionSubmit class="save btn btn-warning" controller="manage" action="updateFromExternalSources" value="${message(code: 'default.button.load.label', default: 'Load')}" onclick="${'$'}('#resource-table').DataTable().search('').draw(); return confirm('${message(code: 'default.button.load.confirm.message', default: 'Are you sure?')}');" /></span>
             </g:if>
         </div>
     </g:form>
@@ -140,7 +140,8 @@
                 {"orderable": false},
                 {"orderable": false},
                 {"orderable": false}
-            ]
+            ],
+            paging: false
         });
     } );
 
@@ -185,4 +186,4 @@
     };
 </script>
 </body>
-</html>
+</html>