IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2024-11-26 02:30:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fixed an issue email already exists and disable the 'Locked' switch when its value is false. Fixes #7618

Browse Source
This commit is contained in:
Akshay Joshi 2022-08-16 15:25:25 +05:30
parent 88a443f73d
commit 485265979e
1 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
web/pgadmin/tools/user_management/static/js/UserManagementDialog.jsx
View File

@ -33,6 +33,7 @@ class UserManagementCollection extends BaseUISchema {
role: '2',
newPassword: undefined,
confirmPassword: undefined,
locked: false,
auth_source: authConstant['INTERNAL']
});
@ -131,7 +132,7 @@ class UserManagementCollection extends BaseUISchema {
}, {
id: 'locked', label: gettext('Locked'), cell: 'switch', width: 60, disableResizing: true,
editable: (state)=> {
return obj.isEditable(state);
return state.locked;
}
}
];
@ -162,10 +163,9 @@ class UserManagementCollection extends BaseUISchema {
setError('email', null);
}
let isEmailFound = false;
if (obj.top?._sessData?.userManagement) {
if (obj.isNew(state) && obj.top?._sessData?.userManagement) {
for (let i=0; i < obj.top._sessData.userManagement.length; i++) {
if (obj.top._sessData.userManagement[i]?.id &&
if (obj.top._sessData.userManagement[i]?.id &&
obj.top._sessData.userManagement[i].email == state.email) {
msg = gettext('Email address \'%s\' already exists', state.email);
setError('email', msg);
@ -174,12 +174,6 @@ class UserManagementCollection extends BaseUISchema {
}
}
if (obj.isNew(state) && isEmailFound) {
msg = gettext('Email address \'%s\' already exists', state.email);
setError('email', msg);
return true;
}
if (obj.isNew(state) && isEmptyString(state.newPassword)) {
msg = gettext('Password cannot be empty for user %s', state.email);
setError('newPassword', msg);