From 593d86d3f217b9feabcf3cae656048fb54aa6bd4 Mon Sep 17 00:00:00 2001 From: Pradip Parkale Date: Tue, 15 Sep 2020 13:19:00 +0530 Subject: [PATCH] Ensure that the 'Remove Server Group' option is available in the context menu. Fixes #5834 --- docs/en_US/release_notes_4_26.rst | 3 ++- web/pgadmin/browser/server_groups/static/js/server_group.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/en_US/release_notes_4_26.rst b/docs/en_US/release_notes_4_26.rst index a34ab2baa..67f7ec2a1 100644 --- a/docs/en_US/release_notes_4_26.rst +++ b/docs/en_US/release_notes_4_26.rst @@ -45,4 +45,5 @@ Bug fixes | `Issue #5815 `_ - Fixed an issue where clicking on the 'Generate script' button shows a forever spinner due to pop up blocker. | `Issue #5816 `_ - Ensure that the 'CREATE SCHEMA' statement should be present in the generated script if the schema is not present in the target database. | `Issue #5820 `_ - Fixed an issue while refreshing Resource Group. -| `Issue #5833 `_ - Fixed an issue where custom sequences are not visible when show system objects are set to false. \ No newline at end of file +| `Issue #5833 `_ - Fixed an issue where custom sequences are not visible when show system objects are set to false. +| `Issue #5834 `_ - Ensure that the 'Remove Server Group' option is available in the context menu. \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/static/js/server_group.js b/web/pgadmin/browser/server_groups/static/js/server_group.js index ac1a0c821..4e2fed5ac 100644 --- a/web/pgadmin/browser/server_groups/static/js/server_group.js +++ b/web/pgadmin/browser/server_groups/static/js/server_group.js @@ -83,7 +83,7 @@ define('pgadmin.node.server_group', [ canDrop: function(itemData) { var serverOwner = itemData.user_id; - if (serverOwner != current_user.id) + if (serverOwner != current_user.id && !_.isUndefined(serverOwner)) return false; return true; }, dropAsRemove: true,