[allura] 02/02: fixup! [#8446] fixed tooltip loading for profile links, converted new setting to boolean

[gc...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

gcruz pushed a commit to branch gc/8446
in repository https://gitbox.apache.org/repos/asf/allura.git

commit cf3c3b9d16cf7130a616e17173832f122c2730d7
Author: Guillermo Cruz <gu...@slashdotmedia.com>
AuthorDate: Mon Jul 18 09:04:15 2022 -0600

    fixup! [#8446] fixed tooltip loading for profile links, converted new setting to boolean
---
 Allura/allura/controllers/project.py | 13 ++++---------
 Allura/allura/templates/members.html |  4 ++--
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Allura/allura/controllers/project.py b/Allura/allura/controllers/project.py
index 2ab8591bf..94b48a17c 100644
--- a/Allura/allura/controllers/project.py
+++ b/Allura/allura/controllers/project.py
@@ -380,17 +380,12 @@ class ProjectController(FeedController):
                 username=user.username,
                 url=user.url(),
                 roles=', '.join(sorted(roles)))
-            if 'Admin' in roles:
-                admins.append(u)
-            elif 'Developer' in roles:
-                developers.append(u)
-            else:
-                users.append(u)
+            _user = user
+            _user['roles'] = ', '.join(sorted(roles))
+            users.append(_user)
         get_username = lambda user: user['username']
-        admins = sorted(admins, key=get_username)
-        developers = sorted(developers, key=get_username)
         users = sorted(users, key=get_username)
-        return dict(users=admins + developers + users)
+        return dict(users=users)
 
     def _check_security(self):
         require_access(c.project, 'read')
diff --git a/Allura/allura/templates/members.html b/Allura/allura/templates/members.html
index a7afb6490..d77dbb368 100644
--- a/Allura/allura/templates/members.html
+++ b/Allura/allura/templates/members.html
@@ -16,9 +16,9 @@
        specific language governing permissions and limitations
        under the License.
 -#}
+{% 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 +36,7 @@
     {%for user in users%}
     <tr>
         <td>{{ user.display_name }}</td>
-        <td><a href="{{ user.url ~ profile_path }}">{{ user.username }}</a></td>
+        <td>{{ lib.user_link(user) }}</td>
         <td>{{user.roles}}</td>
     </tr>
     {%endfor%}