IntenseWebs/pgadmin4
3
0
Fork 0
mirror of https://github.com/pgadmin-org/pgadmin4.git synced 2025-02-25 18:55:31 -06:00
Code Issues Packages Projects Releases Wiki Activity

Ensure that deleting a database should not automatically connect to the next database. Fixes #6685

Browse Source
This commit is contained in:
Nikhil Mohite
2021-08-25 17:01:48 +05:30
committed by Akshay Joshi
parent c543930ac4
commit b30a42ab9e
4 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
web/pgadmin/browser/static/js/collection.js
View File

@@ -86,6 +86,7 @@ define([
hasCollectiveStatistics: true,
canDrop: true,
canDropCascade: true,
selectParentNodeOnDelete: false,
showProperties: function(item, data, panel) {
var that = this,
j = panel.$container.find('.obj_properties').first(),

15
web/pgadmin/browser/static/js/node.js
View File

@@ -569,6 +569,10 @@ define('pgadmin.browser.node', [
dropPriority is set to 2 by default, override it when change is required
*/
dropPriority: 2,
/******************************************************************************
select collection node on deletion.
*/
selectParentNodeOnDelete: false,
// List of common callbacks - that can be used for different
// operations!
callbacks: {
@@ -835,7 +839,16 @@ define('pgadmin.browser.node', [
if (res.success == 0) {
pgBrowser.report_error(res.errormsg, res.info);
} else {
pgBrowser.removeTreeNode(i, true);
// Remove the node from tree and set collection node as selected.
var selectNextNode = true;
if(obj.selectParentNodeOnDelete) {
var prv_i = t.parent(i);
setTimeout(function() {
t.select(prv_i);
}, 10);
selectNextNode = false;
}
pgBrowser.removeTreeNode(i, selectNextNode);
}
return true;
})