From f8e443bda770acf1fc577a9345c368ae818f7da5 Mon Sep 17 00:00:00 2001
From: Aditya Toshniwal <aditya.toshniwal@enterprisedb.com>
Date: Thu, 5 Dec 2019 17:49:51 +0530
Subject: [PATCH] Fix scrolling issue in 'Users' dialog. Fixes #4220.

---
 docs/en_US/release_notes_4_16.rst                      |  1 +
 .../tools/user_management/static/js/user_management.js |  6 +++---
 .../user_management/static/scss/_user_management.scss  | 10 +++++++++-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/docs/en_US/release_notes_4_16.rst b/docs/en_US/release_notes_4_16.rst
index 8335daf90..b250108e0 100644
--- a/docs/en_US/release_notes_4_16.rst
+++ b/docs/en_US/release_notes_4_16.rst
@@ -27,6 +27,7 @@ Bug fixes
 *********
 
 | `Issue #3538 <https://redmine.postgresql.org/issues/3538>`_ -  Fix issue where the Reset button does not get enabled till all the mandatory fields are provided in the dialog.
+| `Issue #4220 <https://redmine.postgresql.org/issues/4220>`_ -  Fix scrolling issue in 'Users' dialog.
 | `Issue #4659 <https://redmine.postgresql.org/issues/4659>`_ -  Updated documentation for default privileges to clarify more on the grantor.
 | `Issue #4674 <https://redmine.postgresql.org/issues/4674>`_ -  Fix query tool launch error if user name contains HTML characters. It's a regression.
 | `Issue #4724 <https://redmine.postgresql.org/issues/4724>`_ -  Fix network disconnect issue while establishing the connection via SSH Tunnel and it impossible to expand the Servers node.
diff --git a/web/pgadmin/tools/user_management/static/js/user_management.js b/web/pgadmin/tools/user_management/static/js/user_management.js
index ea65ca7ac..b1156bf4f 100644
--- a/web/pgadmin/tools/user_management/static/js/user_management.js
+++ b/web/pgadmin/tools/user_management/static/js/user_management.js
@@ -777,7 +777,7 @@ define([
                   add_title: gettext('Add new user'),
                 },
                 $gridBody = $('<div></div>', {
-                  class: 'user_container',
+                  class: 'user_container flex-grow-1',
                 });
 
               $.ajax({
@@ -801,12 +801,12 @@ define([
                 row: UserRow,
                 columns: gridSchema.columns,
                 collection: userCollection,
-                className: 'backgrid table table-bordered table-noouter-border table-hover',
+                className: 'backgrid table table-bordered table-noouter-border table-bottom-border table-hover',
               });
 
               $gridBody.append(view.render().$el[0]);
 
-              this.$content = $('<div class=\'user_management object subnode subnode-noouter-border\'></div>').append(
+              this.$content = $('<div class=\'user_management object subnode subnode-noouter-border d-flex flex-column\'></div>').append(
                 headerTpl(data)).append($gridBody).append($statusBar);
 
               this.elements.content.appendChild(this.$content[0]);
diff --git a/web/pgadmin/tools/user_management/static/scss/_user_management.scss b/web/pgadmin/tools/user_management/static/scss/_user_management.scss
index ca1b090a2..c45ea9bac 100644
--- a/web/pgadmin/tools/user_management/static/scss/_user_management.scss
+++ b/web/pgadmin/tools/user_management/static/scss/_user_management.scss
@@ -4,11 +4,19 @@
 
 .user_container {
   border-bottom: $panel-border;
+  height: 100%;
+  min-height: 0;
+  margin-top: $title-height;
 }
 
 .user_management {
   height: 100%;
   overflow: hidden;
+
+  & .navtab-inline-controls {
+    position: absolute;
+    width: 100%;
+  }
 }
 
 .user_management .search_users form {
@@ -24,4 +32,4 @@
 
 .user_management .backform-tab {
   height: calc(100% - 75px);
-}
\ No newline at end of file
+}