[#8446] reverted changes on members.html template to keep tests happy
diff --git a/Allura/allura/templates/jinja_master/lib.html b/Allura/allura/templates/jinja_master/lib.html
index 34f4dc5..0af3f49 100644
--- a/Allura/allura/templates/jinja_master/lib.html
+++ b/Allura/allura/templates/jinja_master/lib.html
@@ -109,15 +109,13 @@
{% endif %}
{%- endmacro %}
-{% macro user_link(user, avatar=False, size=16, nofollow=False, show_username=False) -%}
+{% macro user_link(user, avatar=False, size=16, nofollow=False) -%}
{% if user %}
{% if not user.is_anonymous() %}
{% set profile_path = user.url() + 'profile/' if g.user_profile_urls_with_profile_path else user.url() %}
<a href="{{profile_path}}" class="user-mention" {% if nofollow %}rel="nofollow" {% endif %}>
{% if avatar %}
{{ gravatar_or_name(user, size) }}
- {% elif show_username %}
- {{ h.really_unicode(user.username) }}
{% else %}
{{ h.really_unicode(user.display_name) }}
{% endif %}
diff --git a/Allura/allura/templates/members.html b/Allura/allura/templates/members.html
index ff81cfb..72e4f33 100644
--- a/Allura/allura/templates/members.html
+++ b/Allura/allura/templates/members.html
@@ -19,6 +19,7 @@
{% import 'allura:templates/jinja_master/lib.html' as lib with context %}
{% set hide_left_bar = True %}
{% set h1_text = c.project.name ~ ' ' ~ 'Project' ~ ' ' ~ 'Member List' %}
+{% set profile_path = 'profile/' if g.user_profile_urls_with_profile_path else '' %}
{% extends g.theme.master %}
{% block title %}{{ h1_text }}{% endblock %}
{% block header %}Members{% endblock %}
@@ -36,7 +37,7 @@
{%for user in users%}
<tr>
<td>{{ user.display_name }}</td>
- <td>{{ lib.user_link(user, show_username=True) }}</td>
+ <td><a href="{{ user.url() ~ profile_path }}">{{ user.username }}</a></td>
<td>{{user.roles}}</td>
</tr>
{%endfor%}
