Changeset 8124413

Timestamp:

Feb 8, 2013, 3:08:37 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

afc5348

Parents:

86accce

git-author:

Alex Dehnert <adehnert@…> (02/08/13 03:08:37)

git-committer:

Alex Dehnert <adehnert@…> (02/08/13 03:08:37)

Message:

Sort and limit the columns of the signatory page

File:

• asadb/groups/views.py (modified) (2 diffs)

asadb/groups/views.py

@@ -942 +942 @@
 @permission_required('groups.view_signatories')
 def view_signatories(request, ):
-    # TODO:
-    # * limit which columns (roles) get displayed
-    # This might want to wait for the generic reporting infrastructure, since
-    # I'd imagine some of it can be reused.
-
     the_groups = groups.models.Group.objects.all()
     groups_filterset = GroupFilter(request.GET, the_groups)
@@ -953 +948 @@
     officers = officers.filter(group__in=the_groups)
     officers = officers.select_related(depth=1)
-    roles = groups.models.OfficerRole.objects.all()
+    role_slugs = ['president', 'treasurer', 'financial', 'reservation']
+    roles = groups.models.OfficerRole.objects.filter(slug__in=role_slugs)
+    roles = sorted(roles, key=lambda r: role_slugs.index(r.slug))
     officers_map = collections.defaultdict(lambda: collections.defaultdict(set))
     for officer in officers: