From f468658b9cbc6d5d28c2b576080ca5f0be6a4ed4 Mon Sep 17 00:00:00 2001 From: PanSpagetka Date: Mon, 8 Jan 2018 13:47:22 +0100 Subject: [PATCH] Delete unnecessary X.empty? check after calling find_record_with_rbac --- app/controllers/cloud_subnet_controller.rb | 3 --- app/controllers/cloud_volume_controller.rb | 3 --- app/controllers/ops_controller/settings/schedules.rb | 6 +----- 3 files changed, 1 insertion(+), 11 deletions(-) diff --git a/app/controllers/cloud_subnet_controller.rb b/app/controllers/cloud_subnet_controller.rb index d3b6788d898..e30de670e68 100644 --- a/app/controllers/cloud_subnet_controller.rb +++ b/app/controllers/cloud_subnet_controller.rb @@ -108,9 +108,6 @@ def create_finished def delete_subnets assert_privileges("cloud_subnet_delete") subnets = find_records_with_rbac(CloudSubnet, checked_or_params) - if subnets.empty? - add_flash(_("No Cloud Subnet were selected for deletion."), :error) - end subnets_to_delete = [] subnets.each do |subnet| diff --git a/app/controllers/cloud_volume_controller.rb b/app/controllers/cloud_volume_controller.rb index 557d4e4d193..c48a8ac1cd1 100644 --- a/app/controllers/cloud_volume_controller.rb +++ b/app/controllers/cloud_volume_controller.rb @@ -337,9 +337,6 @@ def update_finished def delete_volumes assert_privileges("cloud_volume_delete") volumes = find_records_with_rbac(CloudVolume, checked_or_params) - if volumes.empty? - add_flash(_("No Cloud Volumes were selected for deletion."), :error) - end volumes_to_delete = [] volumes.each do |volume| diff --git a/app/controllers/ops_controller/settings/schedules.rb b/app/controllers/ops_controller/settings/schedules.rb index 7f9f13a4239..387a623f5ec 100644 --- a/app/controllers/ops_controller/settings/schedules.rb +++ b/app/controllers/ops_controller/settings/schedules.rb @@ -214,11 +214,7 @@ def schedule_toggle(enable) _("The selected Schedules were disabled") end schedules = find_records_with_rbac(MiqSchedule, checked_or_params) - if schedules.empty? - add_flash(msg, :error) - javascript_flash - end - schedule_enable_disable(schedules, enable) unless schedules.empty? + schedule_enable_disable(schedules, enable) add_flash(msg, :info, true) unless flash_errors? schedule_build_list settings_get_info("st")