Only paginate datatable if per_page is supplied

opensafely-core · Sep 12, 2024 · 8ac805a · 8ac805a
1 parent 217f72f
commit 8ac805a
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/airlock/templates/_components/datatable.html b/airlock/templates/_components/datatable.html
@@ -3,10 +3,10 @@
   <table
     class="{{ class }} hidden"
     data-datatable
-    {% if paging and per_page %}
+    {% if per_page %}
       data-per-page="{{ per_page }}"
     {% endif %}
-    {% attrs id data-column-filter=column_filter data-paging=paging data-sortable=sortable data-searchable=searchable %}
+    {% attrs id data-column-filter=column_filter data-sortable=sortable data-searchable=searchable %}
   >
     {{ children }}
   </table>

diff --git a/airlock/templates/activity.html b/airlock/templates/activity.html
@@ -3,7 +3,7 @@
 
 {% #card title="Recent activity" class="mt-5" %}
   {% if activity %}
-    {% #datatable paging per_page="10" column_filter searchable sortable %}
+    {% #datatable per_page="10" column_filter searchable sortable %}
       <thead>
         <tr>
           <th>

diff --git a/assets/src/scripts/datatable.js b/assets/src/scripts/datatable.js
@@ -14,14 +14,15 @@ function buildTables() {
 
   datatableEls?.forEach((table) => {
     const columnFilter = table.hasAttribute("data-column-filter");
-    const paging = table.hasAttribute("data-paging");
     const searchable = table.hasAttribute("data-searchable");
     const sortable = table.hasAttribute("data-sortable");
 
+    let paging = false;
     let perPage = undefined;
     if (table.hasAttribute("data-per-page")) {
       const dataPerPage = table.getAttribute("data-per-page");
       if (dataPerPage !== null && hasOnlyDigits(dataPerPage)) {
+        paging = true;
         perPage = parseInt(dataPerPage);
       }
     }