From f5f7872eeccdae9f3d05b7e0b7993692c839a507 Mon Sep 17 00:00:00 2001 From: nofaralfasi Date: Sun, 27 Aug 2023 15:47:24 +0300 Subject: [PATCH] Fixes #36703 - Enhance handling of hash-based actions for single buttons Extend support for hash-based actions within dropdown menus for single buttons. --- app/assets/stylesheets/base.scss | 4 ++++ app/helpers/application_helper.rb | 5 ++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/app/assets/stylesheets/base.scss b/app/assets/stylesheets/base.scss index dd27b33c3aa..c660b8d6605 100644 --- 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 index 285ac8dffa0..7b47676899f 100644 --- 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