Changeset bd72d5c for asadb/forms/views.py

Timestamp:

Sep 15, 2011, 3:34:54 PM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, space-access, stable, stage, test-hooks

Children:

5c68184

Parents:

ceaf3bd (diff), fbb362a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (09/15/11 15:34:54)

git-committer:

Alex Dehnert <adehnert@…> (09/15/11 15:34:54)

Message:

Merge remote branch 'remotes/origin/new-db'

File:

• asadb/forms/views.py (modified) (1 diff)

asadb/forms/views.py

@@ -121 +121 @@
 def select_group_fysm(request, ):
     qobj = Q(activity_category__isnull = True) | ~(Q(activity_category__name='Dorm') | Q(activity_category__name='FSILG'))
-    queryset = groups.models.Group.objects.filter(qobj)
+    queryset = groups.models.Group.active_groups.filter(qobj)
     return select_group(
         request,