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 the 'Remove Server' option should be visible in the context menu. Fixes #5861

Browse Source
This commit is contained in:
Pradip Parkale
2020-09-24 10:58:30 +05:30
committed by Akshay Joshi
parent f8611416ec
commit c1d04747a1
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
web/pgadmin/browser/server_groups/servers/static/js/server.js
View File

@@ -58,7 +58,7 @@ define('pgadmin.node.server', [
label: gettext('Server'),
canDrop: function(node){
var serverOwner = node.user_id;
if (serverOwner != current_user.id)
if (serverOwner != current_user.id && !_.isUndefined(serverOwner))
return false;
return true;
},
@@ -763,6 +763,14 @@ define('pgadmin.node.server', [
},
{
id: 'server_owner', label: gettext('Shared Server Owner'), type: 'text', mode: ['properties'],
visible:function(model){
var serverOwner = model.attributes.user_id;
if (model.attributes.shared && serverOwner != current_user.id && pgAdmin.server_mode == 'True'){
return true;
}
return false;
},
},
{
id: 'server_type', label: gettext('Server type'), type: 'options',
@@ -1239,7 +1247,7 @@ define('pgadmin.node.server', [
// Let's not change the status of the tree node now.
if (!_wasConnected) {
tree.setInode(_item);
if (data.shared && pgAdmin.server_mode == 'True'){
if (_data.shared && pgAdmin.server_mode == 'True'){
tree.addIcon(_item, {icon: 'icon-shared-server-not-connected'});
}else{
tree.addIcon(_item, {icon: 'icon-server-not-connected'});