Merge pull request #5124 from h-kataria/fixed_reconfigure_service_rig…

…ht_cell_header Updated right cell header
ManageIQ · Jan 4, 2019 · 50c577c · 50c577c
2 parents 6332d21 + 5d15006
commit 50c577c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/app/controllers/service_controller.rb b/app/controllers/service_controller.rb
@@ -163,7 +163,7 @@ def service_reconfigure
     service_template = service.service_template
     resource_action = service_template.resource_actions.find_by(:action => 'Reconfigure') if service_template
 
-    @right_cell_text = _("Reconfigure Service \"%{name}\"") % {:name => service_template.name}
+    @right_cell_text = _("Reconfigure Service \"%{name}\"") % {:name => service.name}
     dialog_locals = {:resource_action_id => resource_action.id, :target_id => service.id}
     replace_right_cell(:action => "reconfigure_dialog", :dialog_locals => dialog_locals)
   end

diff --git a/spec/controllers/service_controller_spec.rb b/spec/controllers/service_controller_spec.rb
@@ -22,7 +22,7 @@
   end
 
   describe "#service_reconfigure" do
-    let(:service) { instance_double("Service", :id => 321, :service_template => service_template) }
+    let(:service) { instance_double("Service", :id => 321, :service_template => service_template, :name => "foo name") }
     let(:service_template) { instance_double("ServiceTemplate", :name => "the name") }
     let(:ar_association_dummy) { double }
     let(:resource_action) { instance_double("ResourceAction", :id => 123) }
@@ -37,7 +37,7 @@
 
     it "sets the right cell text" do
       controller.send(:service_reconfigure)
-      expect(controller.instance_variable_get(:@right_cell_text)).to eq("Reconfigure Service \"the name\"")
+      expect(controller.instance_variable_get(:@right_cell_text)).to eq("Reconfigure Service \"foo name\"")
     end
 
     it "replaces the right cell with the reconfigure dialog partial" do