Skip to content

Commit

Permalink
Merge pull request #770 from romanblanco/fix_rbac_cloud_volume
Browse files Browse the repository at this point in the history
Check selected Cloud Volumes for RBAC
  • Loading branch information
martinpovolny authored Mar 31, 2017
2 parents d722457 + 451475a commit 690aed4
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 @@ -427,11 +427,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
find_checked_items_with_rbac(CloudVolume)
elsif params[:id].present?
[params[:id]]
else
find_checked_items
find_checked_items_with_rbac(CloudVolume)
end

if volumes.empty?
Expand Down

0 comments on commit 690aed4

Please sign in to comment.