From e2302a6c9bc194f0b78f74fae7828dcf30e6f9b8 Mon Sep 17 00:00:00 2001
From: Nikhil Mohite <nikhil.mohite@enterprisedb.com>
Date: Wed, 23 Jun 2021 11:59:56 +0530
Subject: [PATCH] Ensure that setting 'Open in new browser tab' should be
 visible, it should not be based on the value of 'ENABLE_PSQL'. Fixes #6541

---
 docs/en_US/release_notes_5_5.rst              |  1 +
 .../browser/register_browser_preferences.py   | 55 +++++++++++--------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/docs/en_US/release_notes_5_5.rst b/docs/en_US/release_notes_5_5.rst
index 2c3296676..e931690c2 100644
--- a/docs/en_US/release_notes_5_5.rst
+++ b/docs/en_US/release_notes_5_5.rst
@@ -19,3 +19,4 @@ Bug fixes
 
 | `Issue #6398 <https://redmine.postgresql.org/issues/6398>`_ -  Fixed an issue where detaching the query editor panel gives a blank white panel.
 | `Issue #6489 <https://redmine.postgresql.org/issues/6489>`_ -  Fixed an issue where Execute/Refresh button should not be disabled when we run the empty query.
+| `Issue #6541 <https://redmine.postgresql.org/issues/6541>`_ -  Ensure that setting 'Open in new browser tab' should be visible, it should not be based on the value of 'ENABLE_PSQL'.
diff --git a/web/pgadmin/browser/register_browser_preferences.py b/web/pgadmin/browser/register_browser_preferences.py
index c2c16ad89..50d18c770 100644
--- a/web/pgadmin/browser/register_browser_preferences.py
+++ b/web/pgadmin/browser/register_browser_preferences.py
@@ -505,30 +505,39 @@ def register_browser_preferences(self):
             ' revert back to the default title with placeholders.'
         )
     )
-    if config.ENABLE_PSQL:
-        self.open_in_new_tab = self.preference.register(
-            'tab_settings', 'new_browser_tab_open',
-            gettext("Open in new browser tab"), 'select2', None,
-            category_label=PREF_LABEL_OPTIONS,
-            options=[{'label': gettext('Query Tool'), 'value': 'qt'},
-                     {'label': gettext('Debugger'), 'value': 'debugger'},
-                     {'label': gettext('Schema Diff'), 'value': 'schema_diff'},
-                     {'label': gettext('ERD Tool'), 'value': 'erd_tool'},
-                     {'label': gettext('PSQL Tool'), 'value': 'psql_tool'}],
-            help_str=gettext(
-                'Select Query Tool, Debugger, Schema Diff, ERD Tool '
-                'or PSQL Tool from the drop-down to set '
-                'open in new browser tab for that particular module.'
-            ),
-            select2={
-                'multiple': True, 'allowClear': False,
-                'tags': True, 'first_empty': False,
-                'selectOnClose': False, 'emptyOptions': True,
-                'tokenSeparators': [','],
-                'placeholder': gettext('Select open new tab...')
-            }
-        )
 
+    ope_new_tab_options = [
+        {'label': gettext('Query Tool'), 'value': 'qt'},
+        {'label': gettext('Debugger'), 'value': 'debugger'},
+        {'label': gettext('Schema Diff'), 'value': 'schema_diff'},
+        {'label': gettext('ERD Tool'), 'value': 'erd_tool'}]
+
+    # Allow psq tool to open in new browser tab if ENABLE_PSQL is set to True
+    if config.ENABLE_PSQL:
+        ope_new_tab_options.append(
+            {'label': gettext('PSQL Tool'), 'value': 'psql_tool'})
+
+    self.open_in_new_tab = self.preference.register(
+        'tab_settings', 'new_browser_tab_open',
+        gettext("Open in new browser tab"), 'select2', None,
+        category_label=PREF_LABEL_OPTIONS,
+        options=ope_new_tab_options,
+        help_str=gettext(
+            'Select Query Tool, Debugger, Schema Diff, ERD Tool '
+            'or PSQL Tool from the drop-down to set '
+            'open in new browser tab for that particular module.'
+        ),
+        select2={
+            'multiple': True, 'allowClear': False,
+            'tags': True, 'first_empty': False,
+            'selectOnClose': False, 'emptyOptions': True,
+            'tokenSeparators': [','],
+            'placeholder': gettext('Select open new tab...')
+        }
+    )
+
+    # Set PSQL tool tab title if ENABLE_PSQL is set to True
+    if config.ENABLE_PSQL:
         self.psql_tab_title = self.preference.register(
             'tab_settings', 'psql_tab_title_placeholder',
             gettext("PSQL tool tab title"),