Allow users to be hard-deleted from the admin user show page
This commit is contained in:
parent
8ce26b3ab6
commit
11fb83fcc0
2 changed files with 23 additions and 1 deletions
|
@ -177,7 +177,7 @@
|
||||||
%p Deleting a user has the following effects:
|
%p Deleting a user has the following effects:
|
||||||
= render 'users/deletion_guidance', user: @user
|
= render 'users/deletion_guidance', user: @user
|
||||||
%br
|
%br
|
||||||
= link_to 'Remove user', [:admin, @user], data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
|
= link_to 'Remove user', admin_user_path(@user), data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
|
||||||
- else
|
- else
|
||||||
- if @user.solo_owned_groups.present?
|
- if @user.solo_owned_groups.present?
|
||||||
%p
|
%p
|
||||||
|
@ -188,3 +188,22 @@
|
||||||
- else
|
- else
|
||||||
%p
|
%p
|
||||||
You don't have access to delete this user.
|
You don't have access to delete this user.
|
||||||
|
|
||||||
|
.panel.panel-danger
|
||||||
|
.panel-heading
|
||||||
|
Remove user and contributions
|
||||||
|
.panel-body
|
||||||
|
- if can?(current_user, :destroy_user, @user)
|
||||||
|
%p
|
||||||
|
This option deletes the user and any contributions that
|
||||||
|
would usually be moved to the
|
||||||
|
= succeed "." do
|
||||||
|
= link_to "system ghost user", help_page_path("user/profile/account/delete_account")
|
||||||
|
As well as the user's personal projects, groups owned solely by
|
||||||
|
the user, and projects in them, will also be removed. Commits
|
||||||
|
to other projects are unaffected.
|
||||||
|
%br
|
||||||
|
= link_to 'Remove user and contributions', admin_user_path(@user, hard_delete: true), data: { confirm: "USER #{@user.name} WILL BE REMOVED! Are you sure?" }, method: :delete, class: "btn btn-remove"
|
||||||
|
- else
|
||||||
|
%p
|
||||||
|
You don't have access to delete this user.
|
||||||
|
|
|
@ -117,6 +117,9 @@ describe "Admin::Users", feature: true do
|
||||||
|
|
||||||
expect(page).to have_content(user.email)
|
expect(page).to have_content(user.email)
|
||||||
expect(page).to have_content(user.name)
|
expect(page).to have_content(user.name)
|
||||||
|
expect(page).to have_link('Block user', href: block_admin_user_path(user))
|
||||||
|
expect(page).to have_link('Remove user', href: admin_user_path(user))
|
||||||
|
expect(page).to have_link('Remove user and contributions', href: admin_user_path(user, hard_delete: true))
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'Impersonation' do
|
describe 'Impersonation' do
|
||||||
|
|
Loading…
Reference in a new issue