summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGo MAEDA <maeda@farend.jp>2020-05-15 04:49:41 +0000
committerGo MAEDA <maeda@farend.jp>2020-05-15 04:49:41 +0000
commit87fe91ae52ea988d33cf89261acf5f717167cab7 (patch)
tree9885aa86c3e074c81da6e53723c22dc29300aa05
parentca2bde9fbf0176be069f4c64313216a23558bf89 (diff)
downloadredmine-87fe91ae52ea988d33cf89261acf5f717167cab7.tar.gz
redmine-87fe91ae52ea988d33cf89261acf5f717167cab7.zip
Add missing "icon" class to items with "icon-checked" class in the context menu (#33437).
Patch by Mizuki ISHIKAWA. git-svn-id: http://svn.redmine.org/redmine/trunk@19778 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--app/helpers/context_menus_helper.rb2
-rw-r--r--test/functional/context_menus_controller_test.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/helpers/context_menus_helper.rb b/app/helpers/context_menus_helper.rb
index db71abe31..d545f3c51 100644
--- a/app/helpers/context_menus_helper.rb
+++ b/app/helpers/context_menus_helper.rb
@@ -21,7 +21,7 @@ module ContextMenusHelper
def context_menu_link(name, url, options={})
options[:class] ||= ''
if options.delete(:selected)
- options[:class] += ' icon-checked disabled'
+ options[:class] += ' icon icon-checked disabled'
options[:disabled] = true
end
if options.delete(:disabled)
diff --git a/test/functional/context_menus_controller_test.rb b/test/functional/context_menus_controller_test.rb
index 94417bffe..1e926c29d 100644
--- a/test/functional/context_menus_controller_test.rb
+++ b/test/functional/context_menus_controller_test.rb
@@ -155,7 +155,7 @@ class ContextMenusControllerTest < Redmine::ControllerTest
assert_select 'a[href="#"]', :text => 'List'
assert_select 'ul' do
assert_select 'a', 3
- assert_select 'a.icon-checked', :text => 'Bar'
+ assert_select 'a.icon.icon-checked', :text => 'Bar'
end
end
end