From fe54a124da91bc3240520c4521a89be6100347de Mon Sep 17 00:00:00 2001 From: Surinder Kumar Date: Mon, 22 Aug 2016 12:21:33 +0100 Subject: [PATCH] Don't offer to create resource groups on disconnected servers. Fixes #1569 --- web/pgadmin/browser/server_groups/servers/__init__.py | 1 + .../templates/resource_groups/js/resource_groups.js | 11 +++++------ 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/web/pgadmin/browser/server_groups/servers/__init__.py b/web/pgadmin/browser/server_groups/servers/__init__.py index c12c0b3df..c6b1f37e4 100644 --- a/web/pgadmin/browser/server_groups/servers/__init__.py +++ b/web/pgadmin/browser/server_groups/servers/__init__.py @@ -868,6 +868,7 @@ class ServerNode(PGChildNodeView): manager.server_type ), 'connected': True, + 'server_type': manager.server_type, 'type': manager.server_type, 'version': manager.version, 'db': manager.db, diff --git a/web/pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js b/web/pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js index c98c41ad4..3cc822eb9 100644 --- a/web/pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js +++ b/web/pgadmin/browser/server_groups/servers/resource_groups/templates/resource_groups/js/resource_groups.js @@ -39,12 +39,11 @@ define( /* Function is used to check the server type and version. * Resource Group only supported in PPAS 9.4 and above. */ - enable: function() { - var server_obj = arguments[0]; - if (server_obj.server_type === 'ppas' && server_obj.version >= 90400) - return true; - else - return false; + enable: function(node, item) { + var treeData = this.getTreeNodeHierarchy(item), + server = treeData['server']; + return server.connected && node.server_type === 'ppas' && + node.version >= 90400; } },{ name: 'create_resource_group_on_coll', node: 'coll-resource_group', module: this,