Allow users to be hard-removed from the admin users list page
This commit is contained in:
parent
f09b7f5607
commit
8ce26b3ab6
|
@ -34,9 +34,15 @@
|
|||
- if user.access_locked?
|
||||
%li
|
||||
= link_to 'Unlock', unlock_admin_user_path(user), method: :put, class: 'btn-grouped btn btn-xs btn-success', data: { confirm: 'Are you sure?' }
|
||||
- if user.can_be_removed? && can?(current_user, :destroy_user, user)
|
||||
- if can?(current_user, :destroy_user, user)
|
||||
%li.divider
|
||||
- if user.can_be_removed?
|
||||
%li
|
||||
= link_to 'Remove user', admin_user_path(user),
|
||||
data: { confirm: "USER #{user.name} WILL BE REMOVED! Are you sure?" },
|
||||
method: :delete
|
||||
%li
|
||||
= link_to 'Delete user', [:admin, user], data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and groups linked to this user will also be removed! Consider cancelling this deletion and blocking the user instead. Are you sure?" },
|
||||
class: 'btn btn-remove btn-block',
|
||||
method: :delete
|
||||
= link_to 'Remove user and contributions', admin_user_path(user, hard_delete: true),
|
||||
data: { confirm: "USER #{user.name} WILL BE REMOVED! All issues, merge requests and comments authored by this user, and groups owned solely by them, will also be removed! Are you sure?" },
|
||||
class: 'btn btn-remove btn-block',
|
||||
method: :delete
|
||||
|
|
|
@ -22,7 +22,8 @@ describe "Admin::Users", feature: true do
|
|||
expect(page).to have_content(user.email)
|
||||
expect(page).to have_content(user.name)
|
||||
expect(page).to have_link('Block', href: block_admin_user_path(user))
|
||||
expect(page).to have_link('Delete', href: 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
|
||||
|
||||
describe 'Two-factor Authentication filters' do
|
||||
|
|
Loading…
Reference in New Issue