Release 1.5.13

src/web/views/settings/rbac/list.hbs

@@ -24,10 +24,10 @@
         <table class="table table-striped w-100 mb-0 users-table" data-table-searchable>
           <thead>
             <tr>
-              <th>Role</th>
-              <th>Description</th>
-              <th>Users</th>
-              <th>Permissions</th>
+              <th data-table-sort-key="role">Role</th>
+              <th data-table-sort-key="description">Description</th>
+              <th data-table-sort-key="users">Users</th>
+              <th data-table-sort-key="permissions">Permissions</th>
               <th>Actions</th>
             </tr>
           </thead>

src/web/views/settings/tasks-background/index.hbs

@@ -1,5 +1,3 @@
-<div id="background-tasks-state" data-state-version="{{stateVersion}}" hidden></div>
-
 <div class="page-header">
   <div>
     <h2>Background tasks</h2>
@@ -41,7 +39,7 @@
       </div>
       {{#if canManage}}
         {{#if canClearFinished}}
-        <form method="post" action="/settings/background-tasks/clear-finished">
+        <form method="post" action="/settings/tasks-background/clear-finished">
           <button type="submit" class="btn btn-outline-secondary btn-sm" data-confirm-message="Clear finished background tasks?">Clear finished</button>
         </form>
         {{/if}}
@@ -52,13 +50,13 @@
     <table class="table table-striped w-100 mb-0 align-middle" data-table-searchable>
       <thead>
         <tr>
-          <th>Task</th>
-          <th>Category</th>
-          <th>Status</th>
-          <th>Queued</th>
-          <th>Started</th>
-          <th>Finished</th>
-          <th>Source</th>
+          <th data-table-sort-key="task">Task</th>
+          <th data-table-sort-key="category">Category</th>
+          <th data-table-sort-key="status">Status</th>
+          <th data-table-sort-key="queued">Queued</th>
+          <th data-table-sort-key="started">Started</th>
+          <th data-table-sort-key="finished">Finished</th>
+          <th data-table-sort-key="source">Source</th>
         </tr>
       </thead>
       <tbody>
@@ -129,27 +127,6 @@
       </tbody>
     </table>
   </div>
-  {{#if pagination.hasMultiplePages}}
-  <div class="card-footer d-flex flex-wrap align-items-center justify-content-between gap-3">
-    <div class="text-muted small">
-      Showing {{pagination.startItem}}-{{pagination.endItem}} of {{pagination.totalItems}} tasks
-    </div>
-    <nav aria-label="Background task pages">
-      <ul class="pagination pagination-sm mb-0">
-        <li class="page-item {{#unless pagination.hasPrevious}}disabled{{/unless}}">
-          <a class="page-link" href="{{#if pagination.hasPrevious}}/settings/background-tasks{{pagination.previousUrl}}{{else}}#{{/if}}" aria-label="Previous page">Previous</a>
-        </li>
-        {{#each pagination.pages}}
-          <li class="page-item {{#if active}}active{{/if}}">
-            <a class="page-link" href="/settings/background-tasks{{url}}">{{number}}</a>
-          </li>
-        {{/each}}
-        <li class="page-item {{#unless pagination.hasNext}}disabled{{/unless}}">
-          <a class="page-link" href="{{#if pagination.hasNext}}/settings/background-tasks{{pagination.nextUrl}}{{else}}#{{/if}}" aria-label="Next page">Next</a>
-        </li>
-      </ul>
-    </nav>
-  </div>
-  {{/if}}
+  {{> table-pagination pagination=pagination basePath="/settings/tasks-background"}}
 </div>
 </div>

src/web/views/settings/tasks-scheduled/index.hbs

@@ -1,5 +1,3 @@
-<div id="background-tasks-state" data-state-version="{{stateVersion}}" hidden></div>
-
 <div class="page-header">
   <div>
     <h2>Scheduled tasks</h2>
@@ -21,12 +19,12 @@
     <table class="table table-striped w-100 mb-0 align-middle" data-table-searchable>
       <thead>
         <tr>
-          <th>Task</th>
-          <th>Interval</th>
-          <th>Next run</th>
-          <th>Last run</th>
-          <th>Last result</th>
-          <th>Source</th>
+          <th data-table-sort-key="task">Task</th>
+          <th data-table-sort-key="interval">Interval</th>
+          <th data-table-sort-key="next_run">Next run</th>
+          <th data-table-sort-key="last_run">Last run</th>
+          <th data-table-sort-key="last_result">Last result</th>
+          <th data-table-sort-key="source">Source</th>
           {{#if canManage}}<th>Actions</th>{{/if}}
         </tr>
       </thead>
@@ -68,7 +66,7 @@
               {{#if ../canManage}}
               <td data-label="Actions">
                 <div class="d-flex flex-wrap gap-2">
-                  <form method="post" action="/settings/background-tasks/recurring/{{key}}/run">
+                  <form method="post" action="/settings/tasks-scheduled/recurring/{{key}}/run">
                     <button type="submit" class="btn btn-outline-primary btn-sm">Run now</button>
                   </form>
                 </div>

src/web/views/settings/users/list.hbs

@@ -22,9 +22,9 @@
   <table class="table table-striped w-100 mb-0 users-table" data-table-searchable>
     <thead>
       <tr>
-        <th>User</th>
-        <th>Name</th>
-        <th>Roles</th>
+        <th data-table-sort-key="user">User</th>
+        <th data-table-sort-key="name">Name</th>
+        <th data-table-sort-key="roles">Roles</th>
         <th>Actions</th>
       </tr>
     </thead>