Release v2.5.6
This commit is contained in:
1 parent
a8ef35b287
commit
9f831f04bc
161 files changed
+8487
-1295
No files matched your search
@@ -0,0 +1,20 @@
|
||||
// User duplicate helpers.
|
||||
|
||||
function buildDuplicateUserName(name) {
|
||||
const source = String(name || 'User').trim() || 'User';
|
||||
return 'Copy of ' + source;
|
||||
}
|
||||
|
||||
function buildDuplicateUser(user, duplicateName, duplicateUsername) {
|
||||
const source = user || {};
|
||||
return {
|
||||
id: null,
|
||||
name: String(duplicateName || buildDuplicateUserName(source.name)).trim(),
|
||||
username: String(duplicateUsername || '').trim()
|
||||
};
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
buildDuplicateUserName,
|
||||
buildDuplicateUser
|
||||
};
|
||||
@@ -32,7 +32,7 @@ function buildUsersAddViewModel(message, currentUser, roles, formValues, message
|
||||
footerDeleteTitle: 'Delete is available after the user has been created.',
|
||||
footerShowDelete: true,
|
||||
message: message,
|
||||
messageVariant: messageVariant || 'primary',
|
||||
messageVariant: messageVariant || 'success',
|
||||
currentUser: currentUser || null,
|
||||
roles: mapRolesForForm(roles, []),
|
||||
formValues: formValues || {},
|
||||
@@ -55,11 +55,13 @@ function buildUsersEditViewModel(user, message, currentUser, roles) {
|
||||
footerDeleteConfirmMessage: 'Delete this user?',
|
||||
footerDeleteTitle: user && user.inUse ? 'Delete is disabled while this user is the only account left.' : '',
|
||||
footerShowDelete: true,
|
||||
showSaveSecondaryActions: true,
|
||||
message: message,
|
||||
currentUser: currentUser || null,
|
||||
user: user,
|
||||
inUse: Boolean(user && user.inUse),
|
||||
roles: mapRolesForForm(roles, user && user.roleIds)
|
||||
roles: mapRolesForForm(roles, user && user.roleIds),
|
||||
formAttrs: 'data-async-save data-async-save-close-url="/users" data-async-save-new-url="/users/new"'
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user