Release 2.8.0

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

@@ -24,9 +24,9 @@ function buildUsersAddViewModel(message, currentUser, roles, formValues, message
     active: 'users',
     isEdit: false,
     formId: 'user-form',
-    formAction: '/users',
-    footerSaveUrl: '/users',
-    footerCancelUrl: '/users',
+    formAction: '/settings/users',
+    footerSaveUrl: '/settings/users',
+    footerCancelUrl: '/settings/users',
     footerDeleteUrl: '',
     footerDeleteDisabled: true,
     footerDeleteTitle: 'Delete is available after the user has been created.',
@@ -36,21 +36,21 @@ function buildUsersAddViewModel(message, currentUser, roles, formValues, message
     currentUser: currentUser || null,
     roles: mapRolesForForm(roles, []),
     formValues: formValues || {},
-    formAttrs: 'data-async-save data-async-save-close-url="/users" data-async-save-new-redirect="response-url" data-async-save-new-url="/users/new"'
+    formAttrs: 'data-async-save data-async-save-close-url="/settings/users" data-async-save-new-redirect="response-url" data-async-save-new-url="/settings/users/new"'
   };
 }
 
-function buildUsersEditViewModel(user, message, currentUser, roles) {
+function buildUsersEditViewModel(user, message, currentUser, roles, sessions) {
   return {
     title: 'Edit user',
     active: 'users',
     isEdit: true,
     formId: 'user-profile-form',
-    formAction: '/users/' + user.id + '/username',
-    formAttrs: 'data-async-save data-async-save-close-url="/users"',
-    footerSaveUrl: '/users/' + user.id + '/username',
-    footerCancelUrl: '/users',
-    footerDeleteUrl: '/users/' + user.id + '/delete',
+    formAction: '/settings/users/' + user.id + '/username',
+    formAttrs: 'data-async-save data-async-save-close-url="/settings/users"',
+    footerSaveUrl: '/settings/users/' + user.id + '/username',
+    footerCancelUrl: '/settings/users',
+    footerDeleteUrl: '/settings/users/' + user.id + '/delete',
     footerDeleteDisabled: Boolean(user && user.inUse),
     footerDeleteConfirmMessage: 'Delete this user?',
     footerDeleteTitle: user && user.inUse ? 'Delete is disabled while this user is the only account left.' : '',
@@ -59,9 +59,10 @@ function buildUsersEditViewModel(user, message, currentUser, roles) {
     message: message,
     currentUser: currentUser || null,
     user: user,
+    sessions: Array.isArray(sessions) ? sessions : [],
     inUse: Boolean(user && user.inUse),
     roles: mapRolesForForm(roles, user && user.roleIds),
-    formAttrs: 'data-async-save data-async-save-close-url="/users" data-async-save-new-url="/users/new"'
+    formAttrs: 'data-async-save data-async-save-close-url="/settings/users" data-async-save-new-url="/settings/users/new"'
   };
 }