Merge pull request #13001 from h-kataria/custom_buttons_options_fix

Fixed code that sets values of button_image, display & open_url fields
ManageIQ · Dec 6, 2016 · c34468f · c34468f
2 parents f0be77c + e9c0b51
commit c34468f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/app/controllers/application_controller/buttons.rb b/app/controllers/application_controller/buttons.rb
@@ -843,9 +843,9 @@ def button_set_form_vars
       :target_class   => @resolve[:target_class],
       :name           => @custom_button.name,
       :description    => @custom_button.description,
-      :button_image   => @custom_button.options.try(:button_image).to_s,
-      :display        => @custom_button.options.try(:display) ? @custom_button.options[:display] : true,
-      :open_url       => @custom_button.options.try(:open_url) ? @custom_button.options[:open_url] : false,
+      :button_image   => @custom_button.options.try(:[], :button_image).to_s,
+      :display        => @custom_button.options.try(:[], :display).nil? ? true : @custom_button.options[:display],
+      :open_url       => @custom_button.options.try(:[], :open_url) ? @custom_button.options[:open_url] : false,
       :object_message => @custom_button.uri_message || "create",
     )
     @edit[:current] = copy_hash(@edit[:new])

diff --git a/spec/controllers/application_controller/buttons_spec.rb b/spec/controllers/application_controller/buttons_spec.rb
@@ -129,7 +129,7 @@
       #   which, in turn, needs *something* to come back from automate
       allow(MiqAeClass).to receive_messages(:find_distinct_instances_across_domains => [double(:name => "foo")])
 
-      custom_button = FactoryGirl.create(:custom_button, :applies_to_class => "Vm")
+      custom_button = FactoryGirl.create(:custom_button, :applies_to_class => "Vm", :options => {:display => false, :button_image => "5"})
       custom_button.uri_path, custom_button.uri_attributes, custom_button.uri_message = CustomButton.parse_uri("/test/")
       custom_button.uri_attributes["request"] = "req"
       custom_button.save
@@ -143,6 +143,9 @@
                                       )
       controller.send(:button_set_form_vars)
       expect(assigns(:edit)[:new][:target_class]).to eq(ui_lookup(:model => "Vm"))
+      expect(assigns(:edit)[:new][:display]).to eq(false)
+      expect(assigns(:edit)[:new][:button_image]).to eq('5')
+      expect(assigns(:edit)[:new][:open_url]).to eq(false)
 
       controller.instance_variable_set(:@sb,
                                        :trees       => {