Changeset d3b0d83 for asadb/groups/views.py

Timestamp:

Jun 3, 2013, 5:01:53 AM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

cbd22b4

Parents:

3935609

git-author:

Alex Dehnert <adehnert@…> (06/03/13 05:01:26)

git-committer:

Alex Dehnert <adehnert@…> (06/03/13 05:01:53)

Message:

Sort the signatories page (partial ASA-#232)

File:

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

asadb/groups/views.py

@@ -953 +953 @@
     groups_filterset = GroupFilter(request.GET, the_groups)
     the_groups = groups_filterset.qs
+
     officers = groups.models.OfficeHolder.objects.filter(start_time__lte=datetime.datetime.now(), end_time__gte=datetime.datetime.now())
     officers = officers.filter(group__in=the_groups)
     officers = officers.select_related(depth=1)
+
     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:
@@ -966 +969 @@
         role_list = []
         for role in roles:
-            role_list.append(officers_map[group][role])
+            role_list.append(sorted(officers_map[group][role]))
         officers_data.append((group, role_list))