one more try on the badge query

1 files changed, 6 insertions, 2 deletions

diff --git a/askbot/views/meta.py b/askbot/views/meta.py
index 72d479c6..e77d23e5 100644
--- a/askbot/views/meta.py
+++ b/askbot/views/meta.py
@@ -10,6 +10,7 @@ from django.http import HttpResponseRedirect, HttpResponse
 from django.core.urlresolvers import reverse
 from django.utils.translation import ugettext as _
 from django.views import static
+from django.db.models import Max, Count
 from askbot.forms import FeedbackForm
 from askbot.utils.forms import get_next_url
 from askbot.utils.mail import mail_moderators
@@ -118,9 +119,12 @@ def badge(request, id):
     badge = get_object_or_404(BadgeData, id=id)
     badge_recipients = User.objects.filter(
                             award_user__badge = badge
+                        ).annotate(
+                            last_awarded_at = Max('award_user__awarded_at'),
+                            award_count = Count('award_user')
                         ).order_by(
-                            '-award_user__awarded_at'
-                        ).distinct()
+                            '-last_awarded_at'
+                        )
 
     template = ENV.get_template('badge.html')
     data = {