Release v2.2.0

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

@@ -7,7 +7,7 @@
 
 <div class="row g-4">
   <div class="col-12">
-    <div class="card card-outline card-primary admin-form-card" data-table-search-container>
+    <div class="card card-outline card-primary admin-form-card" data-table-search-container data-table-pagination-card>
       <div class="card-header">
         <h3 class="card-title">Existing roles</h3>
         <div class="card-tools d-flex flex-nowrap align-items-center gap-2">
@@ -26,8 +26,8 @@
             <tr>
               <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 data-table-sort-key="users">Users</th>
               <th>Actions</th>
             </tr>
           </thead>
@@ -49,8 +49,8 @@
                       <span class="empty">No description provided.</span>
                     {{/if}}
                   </td>
-                  <td data-label="Users">{{user_count}}</td>
                   <td data-label="Permissions">{{permission_count}}</td>
+                  <td data-label="Users"><span class="chip">{{user_count}} user{{#if (gt user_count 1)}}s{{else}}{{/if}}{{#if (lt user_count 1)}}s{{/if}}</span></td>
                   <td data-label="Actions">
                     {{#if (anyPermission ../currentUser 'rbac.update' 'rbac.delete')}}
                       <div class="actions users-row-actions">
@@ -58,13 +58,13 @@
                           <a class="btn btn-sm btn-primary" href="/rbac/{{id}}/edit">Edit</a>
                         {{/if}}
                         {{#if (hasPermission ../currentUser 'rbac.delete')}}
-                          {{#unless user_count}}
                             <form method="post" action="/rbac/{{id}}/delete" class="inline-form" data-confirm-message="Delete {{name}}?">
+                              {{#if (gt user_count 0)}}
+                              <button type="submit" class="btn btn-sm btn-outline-danger" disabled>Delete</button>
+                              {{else}}
                               <button type="submit" class="btn btn-sm btn-danger">Delete</button>
+                              {{/if}}
                             </form>
-                          {{else}}
-                            <span class="empty">In use</span>
-                          {{/unless}}
                         {{/if}}
                       </div>
                     {{/if}}
@@ -77,7 +77,7 @@
           </tbody>
         </table>
       </div>
-      {{> table-pagination pagination=pagination basePath="/rbac"}}
+      {{> table-pagination pagination=pagination basePath="/rbac" alwaysShow=true}}
     </div>
   </div>
 </div>