Changeset 4260e2c for asadb/forms

Timestamp:

Oct 12, 2011, 3:57:36 PM (15 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

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

Children:

43434f6

Parents:

1ed7e51

git-author:

Alex Dehnert <adehnert@…> (10/12/11 15:57:36)

git-committer:

Alex Dehnert <adehnert@…> (10/12/11 15:57:36)

Message:

Fix the display of number of confirmations

File:

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

asadb/forms/views.py

@@ -15 +15 @@
 from django.forms import ModelForm
 from django.forms import ModelChoiceField, ModelMultipleChoiceField
+from django.db import connection
 from django.db.models import Q, Count
 
@@ -392 +393 @@
     def get_queryset(self):
         group_updates = forms.models.GroupMembershipUpdate.objects.all()
-        group_updates = group_updates.annotate(num_confirms=Count('group__personmembershipupdate__username', distinct=True))
+        group_updates = group_updates.filter(
+            group__personmembershipupdate__deleted__isnull=True,
+            group__personmembershipupdate__valid__gt=0,
+        )
+        group_updates = group_updates.annotate(num_confirms=Count('group__personmembershipupdate'))
+        #print len(list(group_updates))
+        #for query in connection.queries: print query
         return group_updates