Skip to content

Commit

Permalink
Merge pull request #951 from gberginc/fix/find_checked_ids_with_rbac
Browse files Browse the repository at this point in the history
Fix the missed `find_checked_ids_with_rbac`
(cherry picked from commit 6cf6191)
  • Loading branch information
martinpovolny authored and simaishi committed Apr 7, 2017
1 parent e85a4d1 commit 9fb9b87
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions app/controllers/cloud_volume_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -426,11 +426,11 @@ def update_finished
def delete_volumes
assert_privileges("cloud_volume_delete")
volumes = if @lastaction == "show_list" || (@lastaction == "show" && @layout != "cloud_volume")
find_checked_items_with_rbac(CloudVolume)
find_checked_ids_with_rbac(CloudVolume)
elsif params[:id].present?
[params[:id]]
else
find_checked_items_with_rbac(CloudVolume)
find_checked_ids_with_rbac(CloudVolume)
end

if volumes.empty?
Expand Down

0 comments on commit 9fb9b87

Please sign in to comment.