From f8497d4e7aa3af4ee4a24584ad67816be6405883 Mon Sep 17 00:00:00 2001
From: Nikhil Mohite <nikhil.mohite@enterprisedb.com>
Date: Mon, 11 Jan 2021 13:03:15 +0530
Subject: [PATCH] Fixed an issue where the database list in the new connection
 window is not visible. Fixes #6121

---
 docs/en_US/release_notes_4_30.rst                             | 1 +
 .../databases/templates/databases/sql/default/nodes.sql       | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/docs/en_US/release_notes_4_30.rst b/docs/en_US/release_notes_4_30.rst
index b762f0b4b..d8e51d790 100644
--- a/docs/en_US/release_notes_4_30.rst
+++ b/docs/en_US/release_notes_4_30.rst
@@ -35,3 +35,4 @@ Bug fixes
 | `Issue #6077 <https://redmine.postgresql.org/issues/6077>`_ -  Fixed accessibility issues in various dialogs.
 | `Issue #6084 <https://redmine.postgresql.org/issues/6084>`_ -  Fixed TypeError exception in schema diff when selected any identical object.
 | `Issue #6096 <https://redmine.postgresql.org/issues/6096>`_ -  Updated deployment documentation, refer correctly to uWSGI where Gunicorn had been referenced.
+| `Issue #6121 <https://redmine.postgresql.org/issues/6121>`_ -  Fixed an issue where the database list in the new connection window is not visible.
diff --git a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/nodes.sql b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/nodes.sql
index 7dd63ff7a..de93b3d43 100644
--- a/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/nodes.sql
+++ b/web/pgadmin/browser/server_groups/servers/databases/templates/databases/sql/default/nodes.sql
@@ -14,6 +14,10 @@ AND
 db.datname in ({{db_restrictions}})
 {% endif %}
 
+{% if show_system_objects %}
 AND db.datistemplate in (false, {{show_system_objects}})
+{% else %}
+AND db.datistemplate in (false)
+{% endif %}
 
 ORDER BY datname;