diff --git a/docs/en_US/change_ownership.rst b/docs/en_US/change_ownership.rst new file mode 100644 index 000000000..c7f1f57b4 --- /dev/null +++ b/docs/en_US/change_ownership.rst @@ -0,0 +1,27 @@ +.. _change_ownership: + +************************************ +`Change Ownership Dialog`:index: +************************************ + +Use the *Change Ownership* dialog to change the ownership of the shared servers. +This dialog will appear if a user has been deleted from +:ref:`User Management ` and owned some shared servers. + +Choose the user who will own the shared servers from the drop-down. + +.. image:: images/change_ownership.png + :alt: Change ownership dialog + :align: center + +Click the *Change* button to change the ownership. + +The shared servers owned by the user will be deleted if the user is not +selected from the drop-down. + +.. image:: images/change_ownership_info.png + :alt: Change ownership dialog + :align: center + +Click the *Change* button to change the ownership; click *Close* to +exit the dialog. diff --git a/docs/en_US/getting_started.rst b/docs/en_US/getting_started.rst index 11646b6ea..6dfb6a2bc 100644 --- a/docs/en_US/getting_started.rst +++ b/docs/en_US/getting_started.rst @@ -35,6 +35,7 @@ Mode is pre-configured for security. login mfa user_management + change_ownership change_user_password restore_locked_user ldap diff --git a/docs/en_US/images/add_user.png b/docs/en_US/images/add_user.png index 21e16864c..b91a5e28f 100644 Binary files a/docs/en_US/images/add_user.png and b/docs/en_US/images/add_user.png differ diff --git a/docs/en_US/images/change_ownership.png b/docs/en_US/images/change_ownership.png new file mode 100644 index 000000000..93de79f52 Binary files /dev/null and b/docs/en_US/images/change_ownership.png differ diff --git a/docs/en_US/images/change_ownership_info.png b/docs/en_US/images/change_ownership_info.png new file mode 100644 index 000000000..dec687c29 Binary files /dev/null and b/docs/en_US/images/change_ownership_info.png differ diff --git a/docs/en_US/images/user.png b/docs/en_US/images/user.png index 71a9d78d3..d1f73cca2 100644 Binary files a/docs/en_US/images/user.png and b/docs/en_US/images/user.png differ diff --git a/docs/en_US/release_notes_6_13.rst b/docs/en_US/release_notes_6_13.rst index dceb43730..45324d56e 100644 --- a/docs/en_US/release_notes_6_13.rst +++ b/docs/en_US/release_notes_6_13.rst @@ -15,6 +15,7 @@ Housekeeping ************ | `Issue #7344 `_ - Port Role Reassign dialog to React. + | `Issue #7345 `_ - Port User Management dialog to React. | `Issue #7462 `_ - Remove the SQL files for the unsupported versions of the database server. | `Issue #7567 `_ - Port About dialog to React. | `Issue #7568 `_ - Port change user password and 2FA dialog to React. diff --git a/docs/en_US/user_management.rst b/docs/en_US/user_management.rst index 6a6708a05..f3e5f92fd 100644 --- a/docs/en_US/user_management.rst +++ b/docs/en_US/user_management.rst @@ -35,12 +35,13 @@ To add a user, click the Add (+) button at the top right corner. Provide information about the new pgAdmin role in the row: * Use the drop-down list box next to *Authentication source* field to select the - type of authentication that should be used for the user. If LDAP - authentication is not enabled for pgAdmin, then *Authentication source* field - is disabled. + type of authentication that should be used for the user. If authentication + source is only 'internal' then *Authentication source* field + is disabled. Supported *Authentication source* are internal, ldap, kerberos, + oauth2 and webserver. * Click in the *Username* field, and provide a username for the user. This field - is enabled only if you select *ldap* as authentication source. If you select - *internal* as authentication source, your email address is displayed in the + is enabled only when you select authentication source except *internal*. If you + select *internal* as authentication source, your email address is displayed in the username field. * Click in the *Email* field, and provide an email address for the user. * Use the drop-down list box next to *Role* to select whether a user is an @@ -54,15 +55,19 @@ Provide information about the new pgAdmin role in the row: active; the default is *Yes*. Use this switch to disable account activity without deleting an account. * Use the *New password* field to provide the password associated with the user - specified in the *Email* field. This field is disabled if you select *ldap* - as authentication source since LDAP password is not stored in the pgAdmin database. + specified in the *Email* field. This field is disabled if you select any + authentication source except *internal*. * Re-enter the password in the *Confirm password* field. This field is disabled if you select *ldap* as authentication source. * Move the *Locked* switch to the *True* position if you want to lock the account; - the default is *False*. This functionality is useful when a user is locked by trying unsuccessful login attempts. + the default is *False*. This functionality is useful when a user is locked by + trying unsuccessful login attempts. To discard a user, and revoke access to pgAdmin, click the trash icon to the -left of the row and confirm deletion in the *Delete user?* dialog. +left of the row and confirm deletion in the *Delete user?* dialog. If the user +has created some shared servers, then the :ref:`Change Ownership ` +dialog will appear to change the ownership of a shared server. + Users with the *Administrator* role are able to add, edit and remove pgAdmin users, but otherwise have the same capabilities as those with the *User* role. diff --git a/web/pgadmin/browser/templates/browser/index.html b/web/pgadmin/browser/templates/browser/index.html index 53af00b12..54cff983a 100644 --- a/web/pgadmin/browser/templates/browser/index.html +++ b/web/pgadmin/browser/templates/browser/index.html @@ -144,7 +144,7 @@ window.onload = function(e){