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

1) Fixed issue where Drop and Disconnect connection menu points are too close to each other. Fixes #3279

Browse Source 
2) Rename the context menu from 'Drop Server' to 'Remove Server'. Fixes #3859
This commit is contained in:
Rahul Shirsat
2019-11-07 13:11:24 +05:30
committed by Akshay Joshi
parent 091d2cd0d2
commit 62d55cabd9
4 changed files with 53 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,10 @@ define('pgadmin.browser.node', [
F1: 112,
};
const REMOVE_SERVER_PRIORITY = 5;
const REMOVE_SERVER_LABEL = 'Remove Server';
const SERVER = 'server';
// It has already been defined.
// Avoid running this script again.
if (pgBrowser.Node)
@@ -142,8 +146,8 @@ define('pgadmin.browser.node', [
module: self,
applies: ['object', 'context'],
callback: 'delete_obj',
priority: 2,
label: gettext('Delete/Drop'),
priority: self.get_menu_item_priority(self.type, 2),
label: self.change_menu_label(self.type, gettext('Delete/Drop')),
data: {
'url': 'drop',
},
@@ -755,15 +759,31 @@ define('pgadmin.browser.node', [
return;
}
} else {
msg = gettext('Are you sure you want to drop %s "%s"?', obj.label.toLowerCase(), d.label);
title = gettext('DROP %s?', obj.label);
var remove_drop_text;
if(obj.type === SERVER) {
remove_drop_text = 'Remove';
}
else {
remove_drop_text = 'DROP';
}
msg = gettext('Are you sure you want to %s %s "%s"?', remove_drop_text.toLowerCase(), obj.label.toLowerCase(), d.label);
title = gettext('%s %s?', remove_drop_text, obj.label);
if (!(_.isFunction(obj.canDrop) ?
obj.canDrop.apply(obj, [d, i]) : obj.canDrop)) {
Alertify.error(
gettext('The %s "%s" cannot be dropped.', obj.label, d.label),
10
);
if(obj.type === SERVER) {
Alertify.error(
gettext('The %s "%s" cannot be removed.', obj.label, d.label),
10
);
}
else {
Alertify.error(
gettext('The %s "%s" cannot be dropped.', obj.label, d.label),
10
);
}
return;
}
}
@@ -792,8 +812,14 @@ define('pgadmin.browser.node', [
console.warn(e.stack || e);
}
}
pgBrowser.report_error(
gettext('Error dropping %s: "%s"', obj.label, objName), msg);
if(obj.type === SERVER) {
pgBrowser.report_error(
gettext('Error removing %s: "%s"', obj.label, objName), msg);
}
else {
pgBrowser.report_error(
gettext('Error dropping %s: "%s"', obj.label, objName), msg);
}
});
},
null).show();
@@ -1757,6 +1783,18 @@ define('pgadmin.browser.node', [
return this.parent_type;
}
},
get_menu_item_priority: function(type, default_priority) { //downgrade Remove Server priority in menus only for Servers
if(type && type === SERVER) {
return REMOVE_SERVER_PRIORITY;
}
return default_priority;
},
change_menu_label: function(type, default_label) { //change Delete/Drop menu option to Remove Server
if(type && type === SERVER) {
return gettext(REMOVE_SERVER_LABEL);
}
return default_label;
},
});
return pgAdmin.Browser.Node;