From 5fe7813f9fc43bb3e8ff1ccf9f272c8861de0026 Mon Sep 17 00:00:00 2001 From: Ganesh Jaybhay Date: Mon, 4 May 2020 13:19:13 +0530 Subject: [PATCH] =?UTF-8?q?Fixed=20an=20issue=20where=20select2=20hover=20?= =?UTF-8?q?is=20inconsistent=C2=A0for=20the=20SSL=20field=20in=20create=20?= =?UTF-8?q?server=20dialog.=20Fixes=20#5469?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/en_US/release_notes_4_22.rst | 3 ++- .../browser/server_groups/servers/static/js/server.js | 6 +++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/docs/en_US/release_notes_4_22.rst b/docs/en_US/release_notes_4_22.rst index b77331f47..51b787767 100644 --- a/docs/en_US/release_notes_4_22.rst +++ b/docs/en_US/release_notes_4_22.rst @@ -19,4 +19,5 @@ Bug fixes | `Issue #3694 `_ - Gracefully informed the user that the database is already connected when they click on "Connect Database...". | `Issue #4279 `_ - Ensure that file browse "home" button should point to $HOME rather than /. -| `Issue #5422 `_ - Ensure that the dependencies tab shows correct information for Synonyms. \ No newline at end of file +| `Issue #5422 `_ - Ensure that the dependencies tab shows correct information for Synonyms. +| `Issue #5469 `_ - Fixed an issue where select2 hover is inconsistent for the SSL field in create server dialog. \ No newline at end of file diff --git a/web/pgadmin/browser/server_groups/servers/static/js/server.js b/web/pgadmin/browser/server_groups/servers/static/js/server.js index 57f89919a..1c0760906 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/server.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js @@ -821,7 +821,11 @@ define('pgadmin.node.server', [ mode: ['properties', 'edit', 'create'], readonly: 'isConnected', group: gettext('Connection'), },{ - id: 'sslmode', label: gettext('SSL mode'), type: 'options', group: gettext('SSL'), + id: 'sslmode', label: gettext('SSL mode'), control: 'select2', group: gettext('SSL'), + select2: { + allowClear: false, + minimumResultsForSearch: Infinity, + }, mode: ['properties', 'edit', 'create'], disabled: 'isConnected', 'options': [ {label: gettext('Allow'), value: 'allow'},