Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions docs/en_US/change_password_dialog.rst
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion docs/en_US/menu_bar.rst
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ following options (in alphabetical order):
| | |
| 2) *Deploy Cloud Instance*| Click to open the :ref:`Cloud Deployment <cloud_deployment>` dialog to deploy an cloud instance. |
+-----------------------------+--------------------------------------------------------------------------------------------------------------------------+
| *Change Password...* | Click to open the :ref:`Change Password... <change_password_dialog>` dialog to change your password. |
| *Change Server Password...* | Click to open the :ref:`Change Server Password... <change_password_dialog>` dialog to change the 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. |
Expand Down
10 changes: 7 additions & 3 deletions web/pgadmin/browser/server_groups/servers/static/js/server.js
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -364,7 +364,11 @@ 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(
d.user?.name
? gettext('Change Server Password (%s)', d.user.name)
: gettext('Change Server Password'),
d, obj, i, is_pgpass_file_used);
}).catch(function(error) {
pgAdmin.Browser.notifier.pgRespErrorNotify(error);
});
Expand Down
2 changes: 1 addition & 1 deletion web/pgadmin/static/js/Dialogs/index.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export function showChangeServerPassword() {
// Notify user to update pgpass file
if(isPgPassFileUsed) {
pgAdmin.Browser.notifier.alert(
gettext('Change Password'),
gettext('Change Server Password'),
gettext('Please make sure to disconnect the server'
+ ' and update the new password in the pgpass file'
+ ' before performing any other operation')
Expand Down
Loading