This is an automated email from the ASF dual-hosted git repository.
brondsem pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/allura.git
The following commit(s) were added to refs/heads/master by this push:
new 094aba957 [#8446] update inline username mentions (missed in original
work on this ticket)
094aba957 is described below
commit 094aba95792d56349d3ab54f2fdb24b5ca0ebf7e
Author: Dave Brondsema <[email protected]>
AuthorDate: Wed Feb 21 16:56:57 2024 -0500
[#8446] update inline username mentions (missed in original work on this
ticket)
---
Allura/allura/lib/markdown_extensions.py | 2 +-
Allura/allura/tests/test_globals.py | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Allura/allura/lib/markdown_extensions.py
b/Allura/allura/lib/markdown_extensions.py
index 576f5e737..9bcc7f892 100644
--- a/Allura/allura/lib/markdown_extensions.py
+++ b/Allura/allura/lib/markdown_extensions.py
@@ -343,7 +343,7 @@ class
UserMentionInlinePattern(markdown.inlinepatterns.Pattern):
if user and not user.pending and not user.disabled:
result = etree.Element('a')
result.text = "@%s" % user_name
- result.set('href', user.url())
+ result.set('href', h.username_project_url(user))
result.set('class', 'user-mention')
else:
result = "@%s" % user_name
diff --git a/Allura/allura/tests/test_globals.py
b/Allura/allura/tests/test_globals.py
index 627c633e6..472c1f3a1 100644
--- a/Allura/allura/tests/test_globals.py
+++ b/Allura/allura/tests/test_globals.py
@@ -919,13 +919,13 @@ class TestUserMentions(unittest.TestCase):
ThreadLocalODMSession.flush_all()
output = g.markdown.convert('Hello.. @admin1, how are you?')
assert 'class="user-mention"' in output
- assert ('href="%s"' % u1.url()) in output
+ assert 'href="/u/admin1/profile/"' in output
u2 = M.User.register(dict(username='admin-2'), make_project=True)
ThreadLocalODMSession.flush_all()
output = g.markdown.convert('Do you know @ab? @admin-2 has solved it!')
assert 'Do you know @ab?' in output
assert 'class="user-mention"' in output
- assert ('href="%s"' % u2.url()) in output
+ assert 'href="/u/admin-2/profile/"' in output
output = g.markdown.convert('[email protected] Hey!')
assert '[email protected] Hey!' in output
