Fix for custom button action events

ManageIQ · Nov 13, 2023 · b518fbc · b518fbc
1 parent cf29c3a
commit b518fbc
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/app/controllers/application_controller/buttons.rb b/app/controllers/application_controller/buttons.rb
@@ -203,7 +203,7 @@ def feature_by_action
     @sb[:action] if features_in_action.include?(@sb[:action])
   end
 
-  BASE_MODEL_EXPLORER_CLASSES = [MiqGroup, MiqTemplate, Service, Tenant, User, Vm].freeze
+  BASE_MODEL_EXPLORER_CLASSES = [MiqGroup, MiqTemplate, Tenant, User, Vm].freeze
 
   def custom_button_done
     external_url = ExternalUrl.find_by(

diff --git a/app/controllers/service_controller.rb b/app/controllers/service_controller.rb
@@ -33,9 +33,23 @@ def button
       service_retire
     when 'service_retire_now'
       service_retire_now
+    when "custom_button"
+      @display == 'generic_objects' ? generic_object_custom_buttons : custom_buttons
+    else
+     add_flash("Invalid button action", :error)
+     render_flash
     end
   end
 
+  def generic_object_custom_buttons
+    display_options = {}
+    ids = @lastaction == 'generic_object' ? @sb[:rec_id] : 'LIST'
+    display_options[:display] = @display
+    display_options[:record_id] = parse_nodetype_and_id(x_node).last
+    display_options[:display_id] = params[:id] if @lastaction == 'generic_object'
+    custom_buttons(ids, display_options)
+  end
+
   def title
     _("My Services")
   end

diff --git a/spec/controllers/application_controller/buttons_spec.rb b/spec/controllers/application_controller/buttons_spec.rb
@@ -94,7 +94,7 @@
 
         controller.send(:custom_buttons)
         expect(assigns(:right_cell_text)).to include(service.name)
-        expect(controller.instance_variable_get(:@explorer)).to be_truthy
+        expect(controller.instance_variable_get(:@explorer)).to be_falsy
       end
     end