Changeset 055a7e9

Timestamp:

Nov 23, 2011, 10:46:49 AM (14 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

0b89d5b

Parents:

bf11775

git-author:

Alex Dehnert <adehnert@…> (11/23/11 10:25:30)

git-committer:

Alex Dehnert <adehnert@…> (11/23/11 10:46:49)

Message:

Allow selecting suspended groups elsewhere

File:

• asadb/forms/views.py (modified) (3 diffs)

asadb/forms/views.py

@@ -229 +229 @@
 #####################
 
+membership_update_qs = groups.models.Group.objects.filter(group_status__slug__in=['active', 'suspended', ])
+
 class Form_GroupMembershipUpdate(ModelForm):
-    group = ModelChoiceField(queryset=groups.models.Group.objects.filter(group_status__slug__in=['active', 'suspended', ]))
+    group = ModelChoiceField(queryset=membership_update_qs)
 
     def __init__(self, *args, **kwargs):
@@ -330 +332 @@
 
 class Form_PersonMembershipUpdate(ModelForm):
-    groups = ModelMultipleChoiceField(queryset=groups.models.Group.active_groups.all())
+    groups = ModelMultipleChoiceField(queryset=membership_update_qs)
     class Meta:
         model = forms.models.PersonMembershipUpdate
@@ -372 +374 @@
     update_obj.save()
 
-    qs = groups.models.Group.active_groups
-    filterset = groups.views.GroupFilter(request.GET, qs)
+    filterset = groups.views.GroupFilter(request.GET, membership_update_qs)
     filtered_groups = filterset.qs.all()
     show_filtered_groups = ('search' in request.GET)