Changeset b90b977

Timestamp:

Mar 23, 2012, 1:28:26 AM (14 years ago)

Author:

ASA Group Database <asa-db@…>

Branches:

master, space-access, stable, stage

Children:

e9af979

Parents:

f57cf3c

git-author:

Alex Dehnert <adehnert@…> (03/23/12 01:28:26)

git-committer:

ASA Group Database <asa-db@…> (03/23/12 01:28:26)

Message:

Fixes to groups/format_groups.py to make it work

File:

• asadb/groups/format_groups.py (modified) (3 diffs)

asadb/groups/format_groups.py

@@ -16 +16 @@
 
 
-Qsemiactive = Q(group_status__slug__in=('active', 'suspended', ))
+Qsa = Q(group_status__slug__in=('active', 'suspended', ))
 functions = {
     'finboard' : {
-        'format' : "%(STUDENT_GROUP_NAME)s;%(OFFICER_EMAIL)s",
-        'predicate' : Q(group_funding__slug='undergraduate', group_class__slug='mit-funded', ),
+        'format' : "%(name)s;%(officer_email)s",
+        'predicate' : Qsa & Q(group_funding__slug='undergrad', group_class__slug='mit-funded', ),
     },
     'nolist' : {
-        'format' : "%(STUDENT_GROUP_NAME)s <%(OFFICER_EMAIL)s>",
-        'predicate' : ~Q(officer_email=""),
+        'format' : "%(name)s <%(officer_email)s>",
+        'predicate' : Qsa & Q(officer_email=""),
     },
     'asa-official' : {
@@ -31 +31 @@
     },
     'emails-only' : {
-        'format' : '%(OFFICER_EMAIL)s',
-        'predicate' : Qsemiactive,
+        'format' : '%(officer_email)s',
+        'predicate' : Qsa,
     },
 }
@@ -39 +39 @@
     format = functions[mode]['format']
     predicate = functions[mode]['predicate']
-    gs = groups.models.Group.objects.filter(Qsemiactive & predicate)
+    gs = groups.models.Group.objects.filter(predicate)
     for group in gs:
         print format % {