diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-05-03 17:52:26 +0300 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-05-03 17:52:26 +0300 |
| commit | 57513512b9d0c92f100db7d438f239a256231c33 (patch) | |
| tree | 9e2cdbb253b84c2701caaeaef639e825e47bb217 | |
| parent | f30ab49433c5fc8ee088d2795d02c9340ff5b06c (diff) | |
| parent | d6da528b458942cf66b18b834840e0a6dbba0fc9 (diff) | |
Merge branch '31383-admin-remove-user-text-incorrect' into 'master'
Note Ghost user and refer to user deletion documentation
Closes #31383
See merge request !11012
| -rw-r--r-- | app/views/admin/users/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/profiles/accounts/show.html.haml | 6 | ||||
| -rw-r--r-- | app/views/users/_deletion_guidance.html.haml | 10 | ||||
| -rw-r--r-- | changelogs/unreleased/31383-admin-remove-user-text-incorrect.yml | 4 |
4 files changed, 16 insertions, 10 deletions
diff --git a/app/views/admin/users/show.html.haml b/app/views/admin/users/show.html.haml index 840d843f069..89d0bbb7126 100644 --- a/app/views/admin/users/show.html.haml +++ b/app/views/admin/users/show.html.haml @@ -175,11 +175,7 @@ .panel-body - if @user.can_be_removed? && can?(current_user, :destroy_user, @user) %p Deleting a user has the following effects: - %ul - %li All user content like authored issues, snippets, comments will be removed - - rp = @user.personal_projects.count - - unless rp.zero? - %li #{pluralize rp, 'personal project'} will be removed and cannot be restored + = render 'users/deletion_guidance', user: @user %br = link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove" - else diff --git a/app/views/profiles/accounts/show.html.haml b/app/views/profiles/accounts/show.html.haml index d843cacd52d..73f33e69d68 100644 --- a/app/views/profiles/accounts/show.html.haml +++ b/app/views/profiles/accounts/show.html.haml @@ -118,11 +118,7 @@ - if @user.can_be_removed? && can?(current_user, :destroy_user, @user) %p Deleting an account has the following effects: - %ul - %li All user content like authored issues, snippets, comments will be removed - - rp = current_user.personal_projects.count - - unless rp.zero? - %li #{pluralize rp, 'personal project'} will be removed and cannot be restored + = render 'users/deletion_guidance', user: current_user = link_to 'Delete account', user_registration_path, data: { confirm: "REMOVE #{current_user.name}? Are you sure?" }, method: :delete, class: "btn btn-remove" - else - if @user.solo_owned_groups.present? diff --git a/app/views/users/_deletion_guidance.html.haml b/app/views/users/_deletion_guidance.html.haml new file mode 100644 index 00000000000..0545cab538c --- /dev/null +++ b/app/views/users/_deletion_guidance.html.haml @@ -0,0 +1,10 @@ +- user = local_assigns.fetch(:user) + +%ul + %li + %p + Certain user content will be moved to a system-wide "Ghost User" in order to maintain content for posterity. For further information, please refer to the + = link_to 'user account deletion documentation.', help_page_path("user/profile/account/delete_account", anchor: "associated-records") + - personal_projects_count = user.personal_projects.count + - unless personal_projects_count.zero? + %li #{pluralize(personal_projects_count, 'personal project')} will be removed and cannot be restored diff --git a/changelogs/unreleased/31383-admin-remove-user-text-incorrect.yml b/changelogs/unreleased/31383-admin-remove-user-text-incorrect.yml new file mode 100644 index 00000000000..a2a2c0c42bd --- /dev/null +++ b/changelogs/unreleased/31383-admin-remove-user-text-incorrect.yml @@ -0,0 +1,4 @@ +--- +title: Note Ghost user and refer to user deletion documentation +merge_request: +author: |