User can not add New Server through Quick links. Fixes #2634

REL-1_X
Murtuza Zabuawala 2017-08-17 18:14:06 +05:30 committed by Akshay Joshi
parent dee5186f65
commit e9b80dae9c
4 changed files with 9 additions and 8 deletions

View File

@ -556,8 +556,7 @@ define('pgadmin.node.role', [
return null;
}
})
}),
sg = pgBrowser.Nodes['server-group'];
})
}
return pgBrowser.Nodes['role'];

View File

@ -9,7 +9,7 @@ define('pgadmin.browser.utils',
// Define list of nodes on which Query tool option doesn't appears
var unsupported_nodes = pgAdmin.unsupported_nodes = [
'server-group', 'server', 'coll-tablespace', 'tablespace',
'server_group', 'server', 'coll-tablespace', 'tablespace',
'coll-role', 'role', 'coll-resource_group', 'resource_group',
'coll-database'
];

View File

@ -357,11 +357,13 @@ function(url_for, gettext, r, $, _, pgAdmin, Backbone, Backgrid, Flotr,
// Handler function to support the "Add Server" link
add_new_server: function() {
if (pgBrowser && pgBrowser.tree) {
var i = pgBrowser.tree.first(null, false),
serverModule = r('pgadmin.node.server'),
itemData = pgBrowser.tree.itemData(i);
var i = pgBrowser.tree.selected().length != 0 ?
pgBrowser.tree.selected() :
pgBrowser.tree.first(null, false),
serverModule = r('pgadmin.node.server'),
itemData = pgBrowser.tree.itemData(i);
while (itemData && itemData._type != "server-group") {
while (itemData && itemData._type != "server_group") {
i = pgBrowser.tree.next(i);
itemData = pgBrowser.tree.itemData(i);
}

View File

@ -24,7 +24,7 @@ define(['jquery', 'underscore', 'underscore.string'],
// Exclude non-applicable nodes
var nodes_not_supported = [
"server-group", "server", "catalog_object_column"
"server_group", "server", "catalog_object_column"
];
if(_.indexOf(nodes_not_supported, node_type) >= 0) {
return true;