From 3f94ff13d77e38574a2b0ef2fc1e22eba55665d2 Mon Sep 17 00:00:00 2001
From: Michael McGrath <mmcgrath@desktop.mmcgrath.net>
Date: Mon, 10 Mar 2008 11:17:32 -0500
Subject: [PATCH] username sorted views.  This page is still quite slow

---
 fas/fas/templates/group/view.html | 36 +++++++++++++++----------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/fas/fas/templates/group/view.html b/fas/fas/templates/group/view.html
index 8b52457..bbfd22f 100644
--- a/fas/fas/templates/group/view.html
+++ b/fas/fas/templates/group/view.html
@@ -81,38 +81,38 @@
           <th py:if="can_sponsor">${_('Action')}</th>
         </tr>
       </thead>
-      <tr py:for="role in group.roles">
-        <td><a href="${tg.url('/user/view/%s' % role.member.username)}">${role.member.username}</a></td>
-        <td py:if='role.sponsor'><a href="${tg.url('/user/view/%s' % role.sponsor.username)}">${role.sponsor.username}</a></td>
-        <td py:if='not role.sponsor'>${_('None')}</td>
-        <td>${role.creation.astimezone(timezone).strftime('%Y-%m-%d %H:%M:%S %Z')}</td>
-        <td py:if='role.approval'>${role.approval.astimezone(timezone).strftime('%Y-%m-%d %H:%M:%S %Z')}</td>
-        <td py:if='not role.approval'>${_('None')}</td>
-        <td>${role.role_status}</td>
-        <td>${role.role_type}</td>
+      <tr py:for="role in sorted([(role.member.username, role) for role in group.roles ])">
+        <td><a href="${tg.url('/user/view/%s' % role[1].member.username)}">${role[1].member.username}</a></td>
+        <td py:if='role[1].sponsor'><a href="${tg.url('/user/view/%s' % role[1].sponsor.username)}">${role.sponsor.username}</a></td>
+        <td py:if='not role[1].sponsor'>${_('None')}</td>
+        <td>${role[1].creation.astimezone(timezone).strftime('%Y-%m-%d %H:%M:%S %Z')}</td>
+        <td py:if='role[1].approval'>${role[1].approval.astimezone(timezone).strftime('%Y-%m-%d %H:%M:%S %Z')}</td>
+        <td py:if='not role[1].approval'>${_('None')}</td>
+        <td>${role[1].role_status}</td>
+        <td>${role[1].role_type}</td>
         <!-- This section includes all action items -->
         <td py:if="can_sponsor">
           <ul class="actions">
-            <li py:if="role.role_status == 'unapproved'">
+            <li py:if="role[1].role_status == 'unapproved'">
             <py:if test="group.needs_sponsor">
-            <a href="${tg.url('/group/sponsor/%s/%s' % (group.name, role.member.username))}">${_('Sponsor')}</a>
+            <a href="${tg.url('/group/sponsor/%s/%s' % (group.name, role[1].member.username))}">${_('Sponsor')}</a>
             <script type="text/javascript">var hb1 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/group_sponsor')}'});</script>
             </py:if>
             <py:if test="not group.needs_sponsor">
-            <a href="${tg.url('/group/sponsor/%s/%s' % (group.name, role.member.username))}">${_('Approve')}</a>
+            <a href="${tg.url('/group/sponsor/%s/%s' % (group.name, role[1].member.username))}">${_('Approve')}</a>
             <script type="text/javascript">var hb2 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/group_approve')}'});</script>
             </py:if>
             </li>
-            <li py:if="auth.canRemoveUser(person, group, role.member)">
-            <a href="${tg.url('/group/remove/%s/%s' % (group.name, role.member.username))}">${_('Remove')}</a>
+            <li py:if="auth.canRemoveUser(person, group, role[1].member)">
+            <a href="${tg.url('/group/remove/%s/%s' % (group.name, role[1].member.username))}">${_('Remove')}</a>
             <script type="text/javascript">var hb3 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/group_remove')}'});</script>
             </li>
-            <li py:if="auth.canUpgradeUser(person, group, role.member)">
-            <a href="${tg.url('/group/upgrade/%s/%s' % (group.name, role.member.username))}">${_('Upgrade')}</a>
+            <li py:if="auth.canUpgradeUser(person, group, role[1].member)">
+            <a href="${tg.url('/group/upgrade/%s/%s' % (group.name, role[1].member.username))}">${_('Upgrade')}</a>
             <script type="text/javascript">var hb4 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/group_upgrade')}'});</script>
             </li>
-            <li py:if="auth.canDowngradeUser(person, group, role.member)">
-            <a href="${tg.url('/group/downgrade/%s/%s' % (group.name, role.member.username))}">${_('Downgrade')}</a>
+            <li py:if="auth.canDowngradeUser(person, group, role[1].member)">
+            <a href="${tg.url('/group/downgrade/%s/%s' % (group.name, role[1].member.username))}">${_('Downgrade')}</a>
             <script type="text/javascript">var hb5 = new HelpBalloon({dataURL: '${tg.url('/help/get_help/group_downgrade')}'});</script>
             </li>
           </ul>