mirror of
https://github.com/pgadmin-org/pgadmin4.git
synced 2024-11-24 09:40:21 -06:00
Ensure that the browser tree should be refreshed after changing the ownership. Fixes #7607
This commit is contained in:
parent
2de965d710
commit
16bcb7d4a2
Binary file not shown.
Before Width: | Height: | Size: 55 KiB After Width: | Height: | Size: 68 KiB |
@ -30,6 +30,7 @@ Bug fixes
|
|||||||
*********
|
*********
|
||||||
|
|
||||||
| `Issue #7580 <https://redmine.postgresql.org/issues/7580>`_ - Fixed an issue where backup does not work due to parameter 'preexec_fn' no longer being supported.
|
| `Issue #7580 <https://redmine.postgresql.org/issues/7580>`_ - Fixed an issue where backup does not work due to parameter 'preexec_fn' no longer being supported.
|
||||||
|
| `Issue #7607 <https://redmine.postgresql.org/issues/7607>`_ - Ensure that the browser tree should be refreshed after changing the ownership.
|
||||||
| `Issue #7644 <https://redmine.postgresql.org/issues/7644>`_ - Ensure that the dump servers functionality works from setup.py.
|
| `Issue #7644 <https://redmine.postgresql.org/issues/7644>`_ - Ensure that the dump servers functionality works from setup.py.
|
||||||
| `Issue #7646 <https://redmine.postgresql.org/issues/7646>`_ - Ensure that the Import/Export server menu option is visible.
|
| `Issue #7646 <https://redmine.postgresql.org/issues/7646>`_ - Ensure that the Import/Export server menu option is visible.
|
||||||
| `Issue #7648 <https://redmine.postgresql.org/issues/7648>`_ - Fixed API test case for change password in the server mode.
|
| `Issue #7648 <https://redmine.postgresql.org/issues/7648>`_ - Fixed API test case for change password in the server mode.
|
||||||
|
@ -30,12 +30,11 @@ class ChangeOwnershipSchema extends BaseUISchema {
|
|||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
id: 'note', type: 'note',
|
id: 'note', type: 'note',
|
||||||
text: gettext('Select the user that will take ownership of the shared servers created by <b>' + self.deletedUser + '</b>. <b>' + self.noOfSharedServers + '</b> shared servers are currently owned by this user.'),
|
text: gettext('Select the user that will take ownership of the shared servers created by <b>' + self.deletedUser + '</b>. <b>' + self.noOfSharedServers + '</b> shared servers are currently owned by this user. </br></br> Clicking on the “Change” button will either change ownership if a user is selected or delete any shared servers if no user is selected. There is no way to reverse this action.'),
|
||||||
}, {
|
}, {
|
||||||
id: 'newUser', label: gettext('User'),
|
id: 'newUser', label: gettext('User'),
|
||||||
type: 'select', controlProps: {allowClear: true},
|
type: 'select', controlProps: {allowClear: true},
|
||||||
options: self.adminUserList,
|
options: self.adminUserList
|
||||||
helpMessage: gettext('Note: If no user is selected, the shared servers will be deleted.')
|
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
@ -215,8 +215,9 @@ class UserManagementCollection extends BaseUISchema {
|
|||||||
|
|
||||||
class UserManagementSchema extends BaseUISchema {
|
class UserManagementSchema extends BaseUISchema {
|
||||||
constructor(authSources, roleOptions) {
|
constructor(authSources, roleOptions) {
|
||||||
super();
|
super({refreshBrowserTree: false});
|
||||||
this.userManagementCollObj = new UserManagementCollection(authSources, roleOptions);
|
this.userManagementCollObj = new UserManagementCollection(authSources, roleOptions);
|
||||||
|
this.changeOwnership = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
deleteUser(deleteRow) {
|
deleteUser(deleteRow) {
|
||||||
@ -251,7 +252,10 @@ class UserManagementSchema extends BaseUISchema {
|
|||||||
result?.data?.data?.result?.data,
|
result?.data?.data?.result?.data,
|
||||||
res?.data?.data?.shared_servers,
|
res?.data?.data?.shared_servers,
|
||||||
deletedUser,
|
deletedUser,
|
||||||
deleteRow
|
()=> {
|
||||||
|
this.changeOwnership = true;
|
||||||
|
deleteRow();
|
||||||
|
}
|
||||||
);
|
);
|
||||||
})
|
})
|
||||||
.catch((err)=>{
|
.catch((err)=>{
|
||||||
@ -268,6 +272,12 @@ class UserManagementSchema extends BaseUISchema {
|
|||||||
},
|
},
|
||||||
canSearch: true
|
canSearch: true
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
id: 'refreshBrowserTree', visible: false, type: 'boolean',
|
||||||
|
deps: ['userManagement'], depChange: ()=> {
|
||||||
|
return { refreshBrowserTree: this.changeOwnership }
|
||||||
|
}
|
||||||
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -310,6 +320,21 @@ function UserManagementDialog({onClose}) {
|
|||||||
const onSaveClick = (_isNew, changeData)=>{
|
const onSaveClick = (_isNew, changeData)=>{
|
||||||
return new Promise((resolve, reject)=>{
|
return new Promise((resolve, reject)=>{
|
||||||
try {
|
try {
|
||||||
|
if (changeData['refreshBrowserTree']) {
|
||||||
|
// Confirmation dialog to refresh the browser tree.
|
||||||
|
Notify.confirm(
|
||||||
|
gettext('Browser tree refresh required'),
|
||||||
|
gettext('The ownership of the shared server was changed or the shared server was deleted, so a browser tree refresh is required. Do you wish to refresh the tree?'),
|
||||||
|
function () {
|
||||||
|
pgAdmin.Browser.tree.destroy();
|
||||||
|
},
|
||||||
|
function () {
|
||||||
|
return true;
|
||||||
|
},
|
||||||
|
gettext('Refresh'),
|
||||||
|
gettext('Later')
|
||||||
|
);
|
||||||
|
}
|
||||||
api.post(url_for('user_management.save'), changeData['userManagement'])
|
api.post(url_for('user_management.save'), changeData['userManagement'])
|
||||||
.then(()=>{
|
.then(()=>{
|
||||||
Notify.success('Users Saved Successfully');
|
Notify.success('Users Saved Successfully');
|
||||||
|
Loading…
Reference in New Issue
Block a user