From 125df6a014f867c7e44c3796ea7c4d111c17c204 Mon Sep 17 00:00:00 2001 From: Martin Povolny Date: Fri, 7 Apr 2017 15:59:36 +0200 Subject: [PATCH] Merge pull request #963 from PanSpagetka/fix-rbac-for-floating-ips Fix RBAC for floating ips (cherry picked from commit 2dad1016cacaf36c4f6e2a0d9f68bf873bb75b93) --- app/controllers/floating_ip_controller.rb | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/app/controllers/floating_ip_controller.rb b/app/controllers/floating_ip_controller.rb index 677120b8c8d..bb9e5cffba8 100644 --- a/app/controllers/floating_ip_controller.rb +++ b/app/controllers/floating_ip_controller.rb @@ -94,27 +94,17 @@ def create_finished def delete_floating_ips assert_privileges("floating_ip_delete") - floating_ips = if @lastaction == "show_list" || (@lastaction == "show" && @layout != "floating_ip") - find_checked_items + find_checked_records_with_rbac(FloatingIp) else - [params[:id]] + [find_record_with_rbac(FloatingIp, params[:id])] end if floating_ips.empty? add_flash(_("No Floating IPs were selected for deletion."), :error) end - floating_ips_to_delete = [] - floating_ips.each do |s| - floating_ip = FloatingIp.find(s) - if floating_ip.nil? - add_flash(_("Floating IP no longer exists."), :error) - else - floating_ips_to_delete.push(floating_ip) - end - end - process_floating_ips(floating_ips_to_delete, "destroy") unless floating_ips_to_delete.empty? + process_floating_ips(floating_ips, "destroy") unless floating_ips.empty? # refresh the list if applicable if @lastaction == "show_list"