From 47939e7be6fe1afcdff46a79fce4146de68bdafe Mon Sep 17 00:00:00 2001 From: Hilda Stastna Date: Fri, 20 Apr 2018 17:07:55 +0200 Subject: [PATCH] Fix title in Config Settings page to match the accordion Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1512443 Fix the title in the Configuration > Settings page when selecting Region0 in accordion, to match the name in the accordion. --- app/controllers/ops_controller/settings.rb | 5 +++-- app/controllers/ops_controller/settings/common.rb | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/controllers/ops_controller/settings.rb b/app/controllers/ops_controller/settings.rb index cd1d67c49bc..eb3cc243f41 100644 --- a/app/controllers/ops_controller/settings.rb +++ b/app/controllers/ops_controller/settings.rb @@ -135,8 +135,9 @@ def forest_accept def region_edit settings_set_view_vars - @right_cell_text = _("Settings Region \"%{name}\"") % - {:name => "#{MiqRegion.my_region.description} [#{MiqRegion.my_region.region}]"} + @right_cell_text = _("%{product} Region \"%{name}\"") % + {:name => "#{MiqRegion.my_region.description} [#{MiqRegion.my_region.region}]", + :product => Vmdb::Appliance.PRODUCT_NAME} case params[:button] when "cancel" session[:edit] = @edit = nil diff --git a/app/controllers/ops_controller/settings/common.rb b/app/controllers/ops_controller/settings/common.rb index f95789eb23d..87fd2c16193 100644 --- a/app/controllers/ops_controller/settings/common.rb +++ b/app/controllers/ops_controller/settings/common.rb @@ -1109,8 +1109,9 @@ def settings_get_info(nodetype = x_node) nodes = nodetype.downcase.split("-") case nodes[0] when "root" - @right_cell_text = _("Settings Region \"%{name}\"") % - {:name => "#{MiqRegion.my_region.description} [#{MiqRegion.my_region.region}]"} + @right_cell_text = _("%{product} Region \"%{name}\"") % + {:name => "#{MiqRegion.my_region.description} [#{MiqRegion.my_region.region}]", + :product => Vmdb::Appliance.PRODUCT_NAME} case @sb[:active_tab] when "settings_details" settings_set_view_vars