Changeset 52fb1d5

Timestamp:

May 6, 2013, 8:15:06 PM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

b4cc0cc

Parents:

83759bf

git-author:

Alex Dehnert <adehnert@…> (05/06/13 20:15:06)

git-committer:

Alex Dehnert <adehnert@…> (05/06/13 20:15:06)

Message:

Show group status on the non-student officers page

Location:

asadb

Files:

• groups/views.py (modified) (2 diffs)
• template/groups/reporting/non-students.html (modified) (2 diffs)

asadb/groups/views.py

@@ -1281 +1281 @@
     office_holders = office_holders.filter(role__in=student_roles)
     office_holders = office_holders.exclude(person__in=students.values('username'))
-    office_holders = office_holders.select_related('group', 'role')
+    office_holders = office_holders.select_related('group', 'group__group_status', 'role')
 
     msg = None
@@ -1287 +1287 @@
     if 'sort' in request.GET:
         if request.GET['sort'] == 'group':
-            office_holders = office_holders.order_by('group__name', 'role', 'person', )
+            office_holders = office_holders.order_by('group__name', 'group__group_status', 'role', 'person', )
+        elif request.GET['sort'] == 'status':
+            office_holders = office_holders.order_by('group__group_status', 'group__name', 'role', 'person', )
         elif request.GET['sort'] == 'role':
-            office_holders = office_holders.order_by('role', 'group__name', 'person', )
+            office_holders = office_holders.order_by('role', 'group__group_status', 'group__name', 'person', )
         elif request.GET['sort'] == 'person':
-            office_holders = office_holders.order_by('person', 'group__name', 'role', )
+            office_holders = office_holders.order_by('person', 'group__group_status', 'group__name', 'role', )
         else:
             msg = 'Unknown sort key "%s".' % (request.GET['sort'], )

asadb/template/groups/reporting/non-students.html

@@ -35 +35 @@
 <tr>
     <th><a href='?sort=group'>Group</a></th>
+    <th><a href='?sort=status'>Status</a></th>
     <th><a href='?sort=role'>Role</a></th>
     <th><a href='?sort=person'>Person</a></th>
@@ -41 +42 @@
 <tr>
     <td><a href='{% url groups:group-detail holder.group.pk %}'>{{holder.group.name}}</a></td>
+    <td>{{holder.group.group_status}}</td>
     <td>{{holder.role.display_name}}</td>
     <td>{{holder.person}}</td>