Fixed code that sets values of button_image, display & open_url fields

[h-kataria]

https://bugzilla.redhat.com/show_bug.cgi?id=1401617

@martinpovolny please review, This issue was introduced in commit: 5f31dcf in PR #10118
lines causing the issue are:
https://github.com/ManageIQ/manageiq/blob/master/app/controllers/application_controller/buttons.rb#L846-L848

custom button summary:

Edit screen -
before

after

[simaishi]

Euwe backport conflict:

$ git cherry-pick -e -x -m 1 c34468f
error: could not apply c34468f... Merge pull request #13001 from h-kataria/custom_buttons_options_fix

$ git diff
diff --cc app/controllers/application_controller/buttons.rb
index 0a5a548,0578549..0000000
--- a/app/controllers/application_controller/buttons.rb
+++ b/app/controllers/application_controller/buttons.rb
@@@ -820,14 -836,18 +820,27 @@@ module ApplicationController::Button
      # AE_MAX_RESOLUTION_FIELDS.times{@edit[:new][:attrs].push(Array.new)} if @edit[:new][:attrs].empty?
      # num = AE_MAX_RESOLUTION_FIELDS - @edit[:new][:attrs].length
      (AE_MAX_RESOLUTION_FIELDS - @edit[:new][:attrs].length).times { @edit[:new][:attrs].push([]) }
 +    @edit[:new][:target_class] = @resolve[:target_class]
      @edit[:new][:starting_object] ||= "SYSTEM/PROCESS"
 +    @edit[:new][:name] = @custom_button.name
 +    @edit[:new][:description] = @custom_button.description
 +    @edit[:new][:button_image] = @custom_button.options && @custom_button.options[:button_image] ? @custom_button.options[:button_image] : ""
 +    @edit[:new][:display] = @custom_button.options && @custom_button.options.key?(:display) ? @custom_button.options[:display] : true
 +    @edit[:new][:object_message] = @custom_button.uri_message || "create"
      @edit[:new][:instance_name] ||= "Request"
++<<<<<<< HEAD
++=======
+ 
+     @edit[:new].update(
+       :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).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",
+     )
++>>>>>>> c34468f... Merge pull request #13001 from h-kataria/custom_buttons_options_fix
      @edit[:current] = copy_hash(@edit[:new])
  
      @edit[:new][:button_images] = @edit[:current][:button_images] = build_button_image_options

[simaishi]

@h-kataria Please resolve conflict and make Euwe-specific PR (referencing this one) or suggest other PRs to backport.

[h-kataria]

@simaishi create an EUWE PR: #13415

[simaishi]

Backported to Euwe via #13415