meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-10-17 17:01:01 +00:00
Code Issues Releases Wiki Activity

Fixes @icon-only@ class for quote reply button and test assertions that are always true (#42515).

Browse Source 
git-svn-id: https://svn.redmine.org/redmine/trunk@23853 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2025-07-04 05:28:34 +00:00
parent 955d508588
commit c1115fea4a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/redmine/quote_reply.rb
View File

@ -27,7 +27,7 @@ module Redmine
def quote_reply(url, selector_for_content, icon_only: false) def quote_reply(url, selector_for_content, icon_only: false)
quote_reply_function = "quoteReply('#{j url}', '#{j selector_for_content}', '#{j Setting.text_formatting}')" quote_reply_function = "quoteReply('#{j url}', '#{j selector_for_content}', '#{j Setting.text_formatting}')"
html_options = { class: 'icon icon-quote' } html_options = { class: "#{icon_only ? "icon-only" : "icon"} icon-quote" }
html_options[:title] = l(:button_quote) if icon_only html_options[:title] = l(:button_quote) if icon_only
link_to_function( link_to_function(

6
test/helpers/journals_helper_test.rb
View File

@ -47,7 +47,7 @@ class JournalsHelperTest < Redmine::HelperTest
journals = issue.visible_journals_with_index # add indice journals = issue.visible_journals_with_index # add indice
journal_actions = render_journal_actions(issue, journals.first, {reply_links: true}) journal_actions = render_journal_actions(issue, journals.first, {reply_links: true})
assert_select_in journal_actions, 'a[title=?][class="icon icon-quote"]', 'Quote' assert_select_in journal_actions, 'a[title=?][class="icon-only icon-quote"]', 'Quote'
assert_select_in journal_actions, 'a[title=?][class="icon-only icon-edit"]', 'Edit' assert_select_in journal_actions, 'a[title=?][class="icon-only icon-edit"]', 'Edit'
assert_select_in journal_actions, 'div[class="drdn-items"] a[class="icon icon-del"]' assert_select_in journal_actions, 'div[class="drdn-items"] a[class="icon icon-del"]'
assert_select_in journal_actions, 'div[class="drdn-items"] a[class="icon icon-copy-link"]' assert_select_in journal_actions, 'div[class="drdn-items"] a[class="icon icon-copy-link"]'
@ -66,8 +66,8 @@ class JournalsHelperTest < Redmine::HelperTest
assert_select_in journal_actions, 'span.reaction-button-wrapper' assert_select_in journal_actions, 'span.reaction-button-wrapper'
assert_select_in journal_actions, 'span.drdn' assert_select_in journal_actions, 'span.drdn'
assert_select_in journal_actions, 'a[class="icon-comment"]', false assert_select_in journal_actions, 'a[class="icon-only icon-quote"]', false
assert_select_in journal_actions, 'a[class="icon-edit"]', false assert_select_in journal_actions, 'a[class="icon-only icon-edit"]', false
end end
def test_journal_thumbnail_attachments_should_be_in_the_same_order_as_the_journal_details def test_journal_thumbnail_attachments_should_be_in_the_same_order_as_the_journal_details