From 715c98dcfbeecdf26ef12f4dae09d33c96172ab8 Mon Sep 17 00:00:00 2001 From: PanSpagetka Date: Fri, 21 Apr 2017 14:08:18 +0200 Subject: [PATCH] Add RBAC for Containers Images Scan/Check compliance --- app/controllers/mixins/containers_common_mixin.rb | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/controllers/mixins/containers_common_mixin.rb b/app/controllers/mixins/containers_common_mixin.rb index 32302d64b6c..a9a0126de76 100644 --- a/app/controllers/mixins/containers_common_mixin.rb +++ b/app/controllers/mixins/containers_common_mixin.rb @@ -34,7 +34,7 @@ def button def scan_images assert_privileges("image_scan") showlist = @lastaction == "show_list" - ids = showlist ? find_checked_items : find_current_item(ContainerImage) + ids = showlist ? find_checked_ids_with_rbac(ContainerImage) : find_current_item(ContainerImage) if ids.empty? add_flash(_("No %{model} were selected for Analysis") % {:model => ui_lookup(:tables => "container_image")}, @@ -50,7 +50,7 @@ def scan_images def check_compliance(model) assert_privileges("#{model.name.underscore}_check_compliance") showlist = @lastaction == "show_list" - ids = showlist ? find_checked_items : find_current_item(model) + ids = showlist ? find_checked_ids_with_rbac(model) : find_current_item(model) if ids.empty? add_flash(_("No %{model} were selected for %{task}") % {:model => ui_lookup(:models => model.to_s), @@ -68,7 +68,7 @@ def find_current_item(model) add_flash(_("%{model} no longer exists") % {:model => ui_lookup(:model => model.to_s)}, :error) [] else - [params[:id].to_i] + [find_id_with_rbac(model, params[:id].to_i)] end end