From a4ed9d69768e6b68822774cf26d26d7dc9b4f4ab Mon Sep 17 00:00:00 2001 From: Aditya Toshniwal Date: Fri, 18 May 2018 11:12:38 +0100 Subject: [PATCH] Allow connections to servers with port numbers < 1024 which may be seen in container environments. Fixes #3307 --- docs/en_US/release_notes_3_1.rst | 3 ++- web/pgadmin/browser/server_groups/servers/static/js/server.js | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs/en_US/release_notes_3_1.rst b/docs/en_US/release_notes_3_1.rst index d37e49b68..32ae1703a 100644 --- a/docs/en_US/release_notes_3_1.rst +++ b/docs/en_US/release_notes_3_1.rst @@ -27,7 +27,8 @@ Bug fixes | `Bug #3308 `_ - Fixed issue where icon for Partitioned tables was the same as Non Partitioned tables for Greenplum database | `Bug #3310 `_ - Fixed layout of the alertify error message in the query tool | `Bug #3238 `_ - Standardise the error handling for parsing of JSON response messages from the server -| `Bug #3277 `_ - Ensure server cleanup on exit only happens if the server actually started up. +| `Bug #3277 `_ - Ensure server cleanup on exit only happens if the server actually started up +| `Bug #3307 `_ - Allow connections to servers with port numbers < 1024 which may be seen in container environments | `Bug #3324 `_ - Fix the template loader to work reliably under Windows (fixing external tables under Greenplum) | `Bug #3333 `_ - Ensure the runtime core application is setup before trying to access any settings | `Bug #3342 `_ - Set SESSION_COOKIE_SAMESITE='Lax' per Flask recommendation to prevents sending cookies with CSRF-prone requests from external sites, such as submitting a form \ 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 15acfc909..f84375a20 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/server.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js @@ -676,7 +676,7 @@ define('pgadmin.node.server', [ mode: ['properties', 'edit', 'create'], disabled: 'isConnected', },{ id: 'port', label: gettext('Port'), type: 'int', group: gettext('Connection'), - mode: ['properties', 'edit', 'create'], disabled: 'isConnected', min: 1024, max: 65535, + mode: ['properties', 'edit', 'create'], disabled: 'isConnected', min: 1, max: 65535, },{ id: 'db', label: gettext('Maintenance database'), type: 'text', group: gettext('Connection'), mode: ['properties', 'edit', 'create'], disabled: 'isConnected',