Feature #40913 » feature-40913.patch
| app/controllers/users_controller.rb | ||
|---|---|---|
|
@users = User.logged.where(id: params[:ids]).where.not(id: User.current)
|
||
|
(render_404; return) unless @users.any?
|
||
|
if params[:lock]
|
||
|
@users.update_all status: User::STATUS_LOCKED
|
||
|
flash[:notice] = l(:notice_successful_update)
|
||
|
redirect_to users_path
|
||
|
elsif params[:confirm] == I18n.t(:general_text_Yes)
|
||
|
if params[:confirm] == I18n.t(:general_text_Yes)
|
||
|
@users.destroy_all
|
||
|
flash[:notice] = l(:notice_successful_delete)
|
||
|
redirect_to users_path
|
||
|
end
|
||
|
end
|
||
|
def bulk_lock
|
||
|
@users = User.logged.where(id: params[:ids]).where.not(id: User.current)
|
||
|
(render_404; return) unless @users.any?
|
||
|
@users.update_all status: User::STATUS_LOCKED
|
||
|
flash[:notice] = l(:notice_successful_update)
|
||
|
redirect_to users_path
|
||
|
end
|
||
|
private
|
||
|
def find_user(logged = true)
|
||
| app/views/context_menus/users.html.erb | ||
|---|---|---|
|
</li>
|
||
|
<% end %>
|
||
|
<% else %>
|
||
|
<% unless @users.all?(&:locked?) %>
|
||
|
<li>
|
||
|
<%= context_menu_link l(:button_lock), bulk_lock_users_path(ids: @users.map(&:id)), method: :post, class: 'icon icon-lock' %>
|
||
|
</li>
|
||
|
<% end %>
|
||
|
<li>
|
||
|
<%= context_menu_link l(:button_delete),
|
||
|
{controller: 'users', action: 'bulk_destroy', ids: @users.map(&:id)},
|
||
| app/views/users/bulk_destroy.html.erb | ||
|---|---|---|
|
</div>
|
||
|
<p>
|
||
|
<%= submit_tag l(:button_delete), class: 'btn-alert btn-small' %>
|
||
|
<%= submit_tag l(:button_lock), class: 'btn', name: 'lock' %>
|
||
|
<%= link_to l(:button_cancel), users_path %>
|
||
|
</p>
|
||
|
<%= submit_tag l(:button_delete), class: 'btn-alert btn-small' %>
|
||
|
<% end %>
|
||
|
<%= button_to l(:button_lock), bulk_lock_users_path(ids: @users.map(&:id)), method: :post, class: 'btn', name: 'lock' %>
|
||
|
<%= link_to l(:button_cancel), users_path %>
|
||
| app/views/users/destroy.html.erb | ||
|---|---|---|
|
</p>
|
||
|
</div>
|
||
|
<p>
|
||
|
<%= submit_tag l(:button_delete) %>
|
||
|
<%= submit_tag l(:button_lock), name: 'lock' unless @user.locked? %>
|
||
|
<%= link_to l(:button_cancel), users_path %>
|
||
|
</p>
|
||
|
<%= submit_tag l(:button_delete) %>
|
||
|
<% end %>
|
||
|
<%= button_to l(:button_lock), bulk_lock_users_path(ids: [@user.id]), method: :post, class: 'btn', name: 'lock' unless @user.locked? %>
|
||
|
<%= link_to l(:button_cancel), users_path %>
|
||
| config/routes.rb | ||
|---|---|---|
|
resources :users do
|
||
|
collection do
|
||
|
delete 'bulk_destroy'
|
||
|
post :bulk_lock
|
||
|
end
|
||
|
resources :memberships, :controller => 'principal_memberships'
|
||
|
resources :email_addresses, :only => [:index, :create, :update, :destroy]
|
||
| test/functional/users_controller_test.rb | ||
|---|---|---|
|
assert_nil User.find_by_id(2)
|
||
|
end
|
||
|
def test_bulk_destroy_with_lock_param_should_lock_instead
|
||
|
assert_no_difference 'User.count' do
|
||
|
delete :bulk_destroy, :params => {:ids => [2], :lock => 'lock'}
|
||
|
end
|
||
|
assert_redirected_to '/users'
|
||
|
assert User.find_by_id(2).locked?
|
||
|
end
|
||
|
def test_bulk_destroy_should_require_confirmation
|
||
|
assert_no_difference 'User.count' do
|
||
|
delete :bulk_destroy, :params => {:ids => [2]}
|
||
| ... | ... | |
|
end
|
||
|
assert_response :not_found
|
||
|
end
|
||
|
def test_bulk_lock
|
||
|
assert_difference 'User.status(User::STATUS_LOCKED).count', 1 do
|
||
|
delete :bulk_lock, :params => {:ids => [2]}
|
||
|
end
|
||
|
assert_redirected_to '/users'
|
||
|
assert User.find_by_id(2).locked?
|
||
|
end
|
||
|
def test_bulk_lock_should_not_lock_current_user
|
||
|
assert_difference 'User.status(User::STATUS_LOCKED).count', 1 do
|
||
|
delete :bulk_lock, :params => {:ids => [2, 1]}
|
||
|
end
|
||
|
assert_redirected_to '/users'
|
||
|
assert_not User.find_by_id(1).locked?
|
||
|
assert User.find_by_id(2).locked?
|
||
|
end
|
||
|
def test_bulk_lock_should_be_denied_for_non_admin_users
|
||
|
@request.session[:user_id] = 3
|
||
|
assert_no_difference 'User.status(User::STATUS_LOCKED).count' do
|
||
|
delete :bulk_lock, :params => {:ids => [2]}
|
||
|
end
|
||
|
assert_response :forbidden
|
||
|
end
|
||
|
def test_bulk_lock_should_be_denied_for_anonymous
|
||
|
assert User.find(6).anonymous?
|
||
|
assert_no_difference 'User.status(User::STATUS_LOCKED).count' do
|
||
|
delete :bulk_lock, :params => {:ids => [6]}
|
||
|
end
|
||
|
assert_response :not_found
|
||
|
end
|
||
|
end
|
||