From 3def9792bed82bdf9aa072e5fc63189be1517cce Mon Sep 17 00:00:00 2001 From: Rahul Shirsat Date: Thu, 17 Dec 2020 12:02:32 +0530 Subject: [PATCH] =?UTF-8?q?Added=20appropriate=20help=20message=20and=20a?= =?UTF-8?q?=20placeholder=20for=20letting=20users=20know=20about=C2=A0the?= =?UTF-8?q?=20account=20password=20expiry=20for=20Login/Group=20Role.=20Fi?= =?UTF-8?q?xes=20#5973?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/en_US/release_notes_4_30.rst | 1 + .../browser/server_groups/servers/roles/static/js/role.js | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docs/en_US/release_notes_4_30.rst b/docs/en_US/release_notes_4_30.rst index 8ba5b8121..154633e4d 100644 --- a/docs/en_US/release_notes_4_30.rst +++ b/docs/en_US/release_notes_4_30.rst @@ -21,6 +21,7 @@ Bug fixes | `Issue #5875 `_ - Ensure that the 'template1' database should not be visible after pg_upgrade. | `Issue #5965 `_ - Ensure that the macro query result should be download properly. +| `Issue #5973 `_ - Added appropriate help message and a placeholder for letting users know about the account password expiry for Login/Group Role. | `Issue #6046 `_ - Fixed an issue where the state of the Save File icon does not match the dirty editor indicator. | `Issue #6047 `_ - Fixed an issue where the dirty indicator stays active even if all changes were undone. | `Issue #6058 `_ - Ensure that the rename panel should be disabled when the SQL file opened in the query tool. diff --git a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js index e92741ba8..8b96053e2 100644 --- a/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js +++ b/web/pgadmin/browser/server_groups/servers/roles/static/js/role.js @@ -413,7 +413,9 @@ define('pgadmin.node.role', [ id: 'rolvaliduntil', readonly: 'readonly', type: 'text', group: gettext('Definition'), label: gettext('Account expires'), mode: ['properties', 'edit', 'create'], control: 'datetimepicker', - deps: ['rolcanlogin'], options: {format: 'YYYY-MM-DD HH:mm:ss Z'}, + deps: ['rolcanlogin'], + placeholder: gettext('No Expiry'), + helpMessage: gettext('Please note that if you leave this field blank, then password will never expire.'), },{ id: 'rolconnlimit', type: 'int', group: gettext('Definition'), label: gettext('Connection limit'), cell: 'integer', min : -1,