Release 2.8.0

src/web/routes/settings/rbac/form-view-model.js

@@ -53,17 +53,17 @@ function buildPermissionSections(permissionGroups) {
     });
 
     section.groups.sort(function (left, right) {
-      const leftIndex = toSortIndex(left.resourceIndex);
-      const rightIndex = toSortIndex(right.resourceIndex);
-      if (leftIndex !== rightIndex) {
-        return leftIndex - rightIndex;
-      }
-
       const leftOrder = toSortIndex(left.resourceOrder);
       const rightOrder = toSortIndex(right.resourceOrder);
       if (leftOrder !== rightOrder) {
         return leftOrder - rightOrder;
       }
+
+      const leftIndex = toSortIndex(left.resourceIndex);
+      const rightIndex = toSortIndex(right.resourceIndex);
+      if (leftIndex !== rightIndex) {
+        return leftIndex - rightIndex;
+      }
       return String(left.title || '').localeCompare(String(right.title || ''));
     });
 
@@ -77,17 +77,17 @@ function buildPermissionSections(permissionGroups) {
   });
 
   sections.sort(function (left, right) {
-    const leftIndex = toSortIndex(left.sourceIndex);
-    const rightIndex = toSortIndex(right.sourceIndex);
-    if (leftIndex !== rightIndex) {
-      return leftIndex - rightIndex;
-    }
-
     const leftOrder = toSortIndex(left.sectionOrder);
     const rightOrder = toSortIndex(right.sectionOrder);
     if (leftOrder !== rightOrder) {
       return leftOrder - rightOrder;
     }
+
+    const leftIndex = toSortIndex(left.sourceIndex);
+    const rightIndex = toSortIndex(right.sourceIndex);
+    if (leftIndex !== rightIndex) {
+      return leftIndex - rightIndex;
+    }
     return String(left.title || '').localeCompare(String(right.title || ''));
   });
 
@@ -101,9 +101,10 @@ function buildRbacAddViewModel(message, currentUser, formValues, permissionGroup
     isEdit: false,
     usersPresent: true,
     formId: 'role-create-form',
-    formAction: '/rbac',
-    footerSaveUrl: '/rbac',
-    footerCancelUrl: '/rbac',
+    formAction: '/settings/roles',
+    footerSaveUrl: '/settings/roles',
+    footerCancelUrl: '/settings/roles',
+    cancelConfirmMessage: "You've made changes. Are you sure you want to leave this page?",
     footerDeleteUrl: '',
     footerDeleteDisabled: true,
     footerDeleteTitle: 'Delete is available after the role has been created.',
@@ -116,9 +117,9 @@ function buildRbacAddViewModel(message, currentUser, formValues, permissionGroup
     permissionSections: buildPermissionSections(permissionGroups),
     users: users || [],
     pagination: pagination || null,
-    roleEditBasePath: '/rbac/new',
+    roleEditBasePath: '/settings/roles/new',
     scripts: ['js/rbac-permissions.js'],
-    formAttrs: 'data-async-save data-async-save-close-url="/rbac" data-async-save-new-redirect="response-url" data-async-save-new-url="/rbac/new"'
+    formAttrs: 'data-async-save data-async-save-close-url="/settings/roles" data-async-save-new-redirect="response-url" data-async-save-new-url="/settings/roles/new"'
   };
 }
 
@@ -129,10 +130,11 @@ function buildRbacEditViewModel(role, message, currentUser, permissionGroups, us
     isEdit: true,
     usersPresent: true,
     formId: 'role-edit-form',
-    formAction: '/rbac/' + Number(role && role.id),
-    footerSaveUrl: '/rbac/' + Number(role && role.id),
-    footerCancelUrl: '/rbac',
-    footerDeleteUrl: '/rbac/' + Number(role && role.id) + '/delete',
+    formAction: '/settings/roles/' + Number(role && role.id),
+    footerSaveUrl: '/settings/roles/' + Number(role && role.id),
+    footerCancelUrl: '/settings/roles',
+    cancelConfirmMessage: "You've made changes. Are you sure you want to leave this page?",
+    footerDeleteUrl: '/settings/roles/' + Number(role && role.id) + '/delete',
     footerDeleteDisabled: Boolean(role && role.inUse),
     footerDeleteTitle: role && role.inUse ? 'Delete is disabled while this role is assigned to users.' : '',
     footerShowDelete: true,
@@ -144,9 +146,9 @@ function buildRbacEditViewModel(role, message, currentUser, permissionGroups, us
     permissionSections: buildPermissionSections(permissionGroups),
     users: users || [],
     pagination: pagination || null,
-    roleEditBasePath: '/rbac/' + Number(role && role.id) + '/edit',
+    roleEditBasePath: '/settings/roles/' + Number(role && role.id) + '/edit',
     scripts: ['js/rbac-permissions.js'],
-    formAttrs: 'data-async-save data-async-save-close-url="/rbac" data-async-save-new-url="/rbac/new"'
+    formAttrs: 'data-async-save data-async-save-close-url="/settings/roles" data-async-save-new-url="/settings/roles/new"'
   };
 }