Release v2.2.0

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

@@ -28,14 +28,17 @@
         <div class="card-footer d-flex justify-content-end flex-wrap">
           <div class="btn-group" role="group" aria-label="Role actions">
             {{{saveActionButtons formId="role-edit-form" saveLabel="Save" saveAndCloseLabel="Save and Close" saveAndCloseValue="close" showSaveAndNew=false}}}
+            <a class="btn btn-warning" href="/rbac" data-confirm-unsaved="You have unsaved changes. Leave this page?">Cancel</a>
+            {{#if inUse}}
+              <button type="submit" class="btn btn-outline-danger" form="role-delete-form" disabled>Delete</button>
+            {{else}}
+              <button type="submit" class="btn btn-danger" form="role-delete-form">Delete</button>
+            {{/if}}
           </div>
-          {{#unless role.user_count}}
-            <button type="submit" class="btn btn-danger" form="role-delete-form">Delete</button>
-          {{/unless}}
         </div>
       </div>
 
-      <div class="card card-outline card-secondary admin-form-card" data-table-search-container>
+      <div class="card card-outline card-secondary admin-form-card" data-table-search-container data-table-pagination-card>
         <div class="card-header d-flex flex-wrap align-items-center justify-content-between">
           <h3 class="card-title">Users</h3>
           <div class="input-group input-group-sm flex-shrink-1 ms-auto" style="width: min(14rem, 100%);">
@@ -78,7 +81,7 @@
             </tbody>
           </table>
         </div>
-        {{> table-pagination pagination=pagination basePath=roleEditBasePath}}
+        {{> table-pagination pagination=pagination basePath=roleEditBasePath alwaysShow=true}}
       </div>
     </div>