Fixes #36703 - Enhance handling of hash-based actions for single buttons

Extend support for hash-based actions within dropdown menus for single buttons.
theforeman · Aug 27, 2023 · f5f7872 · f5f7872
1 parent 55b0a9f
commit f5f7872
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss
@@ -664,3 +664,7 @@ td .dropdown-menu > li > a.disabled:hover,
 td .dropdown-menu > li > a.disabled:focus {
   cursor: pointer;
 }
+
+span.btn a.disabled {
+ color: #8b8d8f;
+}
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -231,7 +231,10 @@ def action_buttons(*args)
     return if args.blank?
 
     # single button
-    return content_tag(:span, args[0].html_safe, :class => 'btn btn-sm btn-default') if args.length == 1
+    if args.length == 1
+      action = args[0].is_a?(Hash) ? args[0][:content] : args[0]
+      return content_tag(:span, action.html_safe, :class => 'btn btn-sm btn-default')
+    end
 
     # multiple buttons
     primary = args.delete_at(0).html_safe