From 84a4f3b0db8611eaacfbbb5981612e6c1fbdf9e7 Mon Sep 17 00:00:00 2001 From: Adrian Toth Date: Tue, 5 Sep 2017 09:21:31 +0200 Subject: [PATCH] Remove VALID_PERF_PARENTS from UiConstants --- app/controllers/application_controller/performance.rb | 2 +- app/helpers/application_helper.rb | 5 +++++ app/helpers/ui_constants.rb | 5 ----- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/application_controller/performance.rb b/app/controllers/application_controller/performance.rb index 6ecf390212f..ed64af8577b 100644 --- a/app/controllers/application_controller/performance.rb +++ b/app/controllers/application_controller/performance.rb @@ -687,7 +687,7 @@ def perf_gen_data_before_wait if perf_parent? # Build the parent report, if asked for p_rpt = Marshal.load(Marshal.dump(rpt)) # Deep clone the main report p_rpt.where_clause[1] = @perf_options[:parent] - p_rpt.where_clause[2] = @perf_record.send(VALID_PERF_PARENTS[@perf_options[:parent]]).id + p_rpt.where_clause[2] = @perf_record.send(ApplicationHelper::VALID_PERF_PARENTS[@perf_options[:parent]]).id rpts.push(p_rpt) end diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 02f5693224e..1ff736b85b8 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -13,6 +13,11 @@ module ApplicationHelper include PlanningHelper include Title + VALID_PERF_PARENTS = { + "EmsCluster" => :ems_cluster, + "Host" => :host + } + # Need to generate paths w/o hostname by default to make proxying work. # def url_for_only_path(args) diff --git a/app/helpers/ui_constants.rb b/app/helpers/ui_constants.rb index d3caa51ab0b..4d0231ccdba 100644 --- a/app/helpers/ui_constants.rb +++ b/app/helpers/ui_constants.rb @@ -86,11 +86,6 @@ module UiConstants EXP_FROM = "FROM" EXP_IS = "IS" - VALID_PERF_PARENTS = { - "EmsCluster" => :ems_cluster, - "Host" => :host - } - MIQ_AE_COPY_ACTIONS = %w(miq_ae_class_copy miq_ae_instance_copy miq_ae_method_copy) end