diff --git a/docs/en_US/change_password_dialog.rst b/docs/en_US/change_password_dialog.rst index e057c4a4b..5c1497ca9 100644 --- a/docs/en_US/change_password_dialog.rst +++ b/docs/en_US/change_password_dialog.rst @@ -1,8 +1,8 @@ .. _change_password_dialog: -******************************* -`Change Password Dialog`:index: -******************************* +************************************** +`Change Server Password Dialog`:index: +************************************** It is a good policy to routinely change your password to protect data, even in what you may consider a 'safe' environment. In the workplace, failure to apply @@ -30,7 +30,9 @@ comprehensive list and they **will not guarantee security**. :alt: Change database password dialog :align: center -Use the *Change Password* dialog to change your password: +Use the *Change Server Password* dialog to change the password of the role that +pgAdmin uses to connect to the database server, rather than the password you use +to log in to pgAdmin itself: * The name displayed in the *User* field is the role for which you are modifying the password; it is the role that is associated with the server connection @@ -39,7 +41,7 @@ Use the *Change Password* dialog to change your password: * Enter the desired password for in the *New Password* field. * Re-enter the new password in the *Confirm Password* field. -Click the *Save* button to change your password. +Click the *Change* button to change your password. Click the *Close* button to exit without changing your password. diff --git a/docs/en_US/change_user_password.rst b/docs/en_US/change_user_password.rst index 681da2eed..380b4bd64 100644 --- a/docs/en_US/change_user_password.rst +++ b/docs/en_US/change_user_password.rst @@ -1,8 +1,8 @@ .. _change_user_password: -************************************ -`Change User Password Dialog`:index: -************************************ +*************************************** +`Change pgAdmin Password Dialog`:index: +*************************************** It is a good policy to routinely change your password to protect data, even in what you may consider a 'safe' environment. In the workplace, failure to apply @@ -30,11 +30,12 @@ comprehensive list and they **will not guarantee security**. :alt: Change current user password dialog :align: center -Use the *Change Password* dialog to change your password: +Use the *Change pgAdmin Password* dialog to change the password you use to log +in to pgAdmin itself, rather than the password of a database server connection: * Enter your existing password in the *Current Password* field. * Enter the desired password for in the *New Password* field. * Re-enter the new password in the *Confirm Password* field. -Click the *Change Password* button to change your password; click *Close* to -exit the dialog. \ No newline at end of file +Click the *Change* button to change your password; click *Close* to exit the +dialog. diff --git a/docs/en_US/menu_bar.rst b/docs/en_US/menu_bar.rst index 871de8799..fd281a2e7 100644 --- a/docs/en_US/menu_bar.rst +++ b/docs/en_US/menu_bar.rst @@ -72,7 +72,7 @@ following options (in alphabetical order): | | | | 2) *Deploy Cloud Instance*| Click to open the :ref:`Cloud Deployment ` dialog to deploy an cloud instance. | +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ -| *Change Password...* | Click to open the :ref:`Change Password... ` dialog to change your password. | +| *Change Server Password...* | Click to open the :ref:`Change Server Password... ` dialog to change the server password. | +-----------------------------+--------------------------------------------------------------------------------------------------------------------------+ | *Clear Saved Password* | If you have saved the database server password, click to clear the saved password. | | | Enable only when password is already saved. | 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 281d48093..647bc4760 100644 --- a/web/pgadmin/browser/server_groups/servers/static/js/server.js +++ b/web/pgadmin/browser/server_groups/servers/static/js/server.js @@ -126,9 +126,9 @@ define('pgadmin.node.server', [ },{ name: 'change_password', node: 'server', module: this, applies: ['object'], callback: 'change_password', - label: gettext('Change Password...'), priority: 10, + label: gettext('Change Server Password...'), priority: 10, enable : 'is_connected',data: { - data_disabled: gettext('Please connect server to enable change password.'), + data_disabled: gettext('Please connect the server to enable Change Server Password.'), }, },{ name: 'wal_replay_pause', node: 'server', module: this, @@ -364,7 +364,9 @@ define('pgadmin.node.server', [ if (res.success && res.data.is_pgpass) { is_pgpass_file_used = true; } - showChangeServerPassword(gettext('Change Password'), d, obj, i, is_pgpass_file_used); + showChangeServerPassword( + gettext('Change Server Password (%s)', d.user.name), + d, obj, i, is_pgpass_file_used); }).catch(function(error) { pgAdmin.Browser.notifier.pgRespErrorNotify(error); }); diff --git a/web/pgadmin/browser/templates/browser/js/utils.js b/web/pgadmin/browser/templates/browser/js/utils.js index e88fcff49..eac6aea51 100644 --- a/web/pgadmin/browser/templates/browser/js/utils.js +++ b/web/pgadmin/browser/templates/browser/js/utils.js @@ -121,7 +121,7 @@ define('pgadmin.browser.utils', menus: [ {% if auth_only_internal %} { - label: '{{ _('Change Password') }}', + label: '{{ _('Change pgAdmin Password') }}', type: 'normal', callback: ()=>{ pgAdmin.UserManagement.change_password( diff --git a/web/pgadmin/static/js/Dialogs/ChangePasswordContent.jsx b/web/pgadmin/static/js/Dialogs/ChangePasswordContent.jsx index 6ce2b46c9..d7f6fea15 100644 --- a/web/pgadmin/static/js/Dialogs/ChangePasswordContent.jsx +++ b/web/pgadmin/static/js/Dialogs/ChangePasswordContent.jsx @@ -64,11 +64,11 @@ class ChangePasswordSchema extends BaseUISchema { } export default function ChangePasswordContent({getInitData=() => { /*This is intentional (SonarQube)*/ }, - onSave, onClose, hasCsrfToken=false, showUser=true}) { + onSave, onClose, hasCsrfToken=false, showUser=true, userName=''}) { const schema=React.useRef(null); if (!schema.current) schema.current = new ChangePasswordSchema( - '', false, hasCsrfToken, showUser + userName, false, hasCsrfToken, showUser ); return { return {