Changeset ca9e802 for asadb/groups/diffs.py

Timestamp:

Nov 5, 2012, 4:23:58 AM (13 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage

Children:

1f48e70

Parents:

bbc8f73

git-author:

Alex Dehnert <adehnert@…> (11/05/12 04:23:58)

git-committer:

Alex Dehnert <adehnert@…> (11/05/12 04:23:58)

Message:

Remove inactive groups from asa-official (ASA-#161)

File:

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

asadb/groups/diffs.py

@@ -243 +243 @@
 
 
+def default_active_pred():
+    status_objs = groups.models.GroupStatus.objects.filter(slug__in=['active', 'suspended', 'nge'])
+    status_pks = [status.pk for status in status_objs]
+    def pred(version, fields):
+        return fields['group_status'] in status_pks
+    return pred
+
 def funded_pred(funding_slug):
     classes = groups.models.GroupClass.objects
@@ -248 +255 @@
     fundings = groups.models.GroupFunding.objects
     fund_pk = fundings.get(slug=funding_slug).pk
+    active_pred = default_active_pred()
     def pred(version, fields):
-        return fields['group_class'] == class_pk and fields['group_funding'] == fund_pk
+        return active_pred(version, fields) and fields['group_class'] == class_pk and fields['group_funding'] == fund_pk
     return pred
 
@@ -291 +299 @@
     sao_callback.care_about_groups = False
     callbacks.append(sao_callback)
-    callbacks.append(UpdateOfficerListCallback(asa_all_groups_list))
+    callbacks.append(UpdateOfficerListCallback(
+        listobj=asa_all_groups_list,
+        include_pred=default_active_pred(),
+    ))
     callbacks.append(UpdateOfficerListCallback(
         listobj=finboard_groups_list,