meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2026-01-31 11:37:14 +00:00
Code Issues Releases Wiki Activity

Add class @user-mention@ to user classes when user is linked using @ (#36699, #13919).

Browse Source 
git-svn-id: http://svn.redmine.org/redmine/trunk@21440 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Marius Balteanu 2022-02-24 21:54:30 +00:00
parent 8470b8b478
commit fbca88afc4
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/helpers/application_helper.rb
View File

@ -1265,7 +1265,7 @@ module ApplicationHelper
elsif sep == "@"
name = remove_double_quotes(identifier)
u = User.visible.find_by("LOWER(login) = :s AND type = 'User'", :s => name.downcase)
link = link_to_user(u, :only_path => only_path) if u
link = link_to_user(u, :only_path => only_path, :class => 'user-mention') if u
end
end
(leading + (link || "#{project_prefix}#{prefix}#{repo_prefix}#{sep}#{identifier}#{comment_suffix}"))

14
test/helpers/application_helper_test.rb
View File

@ -562,12 +562,12 @@ class ApplicationHelperTest < Redmine::HelperTest
'user:jsmith' => link_to_user(User.find_by_id(2)),
'user:JSMITH' => link_to_user(User.find_by_id(2)),
'user#2' => link_to_user(User.find_by_id(2)),
'@jsmith' => link_to_user(User.find_by_id(2)),
'@jsmith.' => "#{link_to_user(User.find_by_id(2))}.",
'@JSMITH' => link_to_user(User.find_by_id(2)),
'@abcd@example.com' => link_to_user(User.find_by_id(u_email_id)),
'@jsmith' => link_to_user(User.find_by_id(2), class: 'user-mention'),
'@jsmith.' => "#{link_to_user(User.find_by_id(2), class: 'user-mention')}.",
'@JSMITH' => link_to_user(User.find_by_id(2), class: 'user-mention'),
'@abcd@example.com' => link_to_user(User.find_by_id(u_email_id), class: 'user-mention'),
'user:abcd@example.com' => link_to_user(User.find_by_id(u_email_id)),
'@foo.bar@example.com' => link_to_user(User.find_by_id(u_email_id_2)),
'@foo.bar@example.com' => link_to_user(User.find_by_id(u_email_id_2), class: 'user-mention'),
'user:foo.bar@example.com' => link_to_user(User.find_by_id(u_email_id_2)),
# invalid user
'user:foobar' => 'user:foobar',
@ -596,7 +596,7 @@ class ApplicationHelperTest < Redmine::HelperTest
# user link format: @jsmith@somenet.foo
raw = "@jsmith@somenet.foo should not be parsed in jsmith@somenet.foo"
assert_match(
%r{<p><a class="user active".*>#{u.name}</a> should not be parsed in #{html}</p>},
%r{<p><a class="user active user-mention".*>#{u.name}</a> should not be parsed in #{html}</p>},
textilizable(raw, :project => Project.find(1))
)
# user link format: user:jsmith@somenet.foo
@ -616,7 +616,7 @@ class ApplicationHelperTest < Redmine::HelperTest
# user link format: @jsmith@somenet.foo
raw = "@jsmith@somenet.foo should not be parsed in jsmith@somenet.foo"
assert_match(
%r{<p><a class=\"user active\".*>#{u.name}</a> should not be parsed in #{html}</p>},
%r{<p><a class=\"user active user-mention\".*>#{u.name}</a> should not be parsed in #{html}</p>},
textilizable(raw, :project => Project.find(1))
)
# user link format: user:jsmith@somenet.foo