Changeset 399:bc710ec105af

Timestamp:

Mar 4, 2012 1:24:39 AM (15 months ago)

Author:

Igor Yanchenko <yanchenko.igor@…>

Branch:

default

Message:

logic with reputation moved from view to profile manager

Location:

djangobb_forum

Files:

• models.py (modified) (2 diffs)
• views.py (modified) (2 diffs)

djangobb_forum/models.py

@@ -315 +315 @@
 
 
+class ProfileManager(models.Manager):
+    def get_query_set(self):
+        qs = super(ProfileManager, self).get_query_set()
+        if forum_settings.REPUTATION_SUPPORT:
+            qs = qs.extra(select={'reply_total':'Select sum(sign) from djangobb_forum_reputation group by to_user_id'})
+        return qs
+
 class Profile(models.Model):
     user = AutoOneToOneField(User, related_name='forum_profile', verbose_name=_('User'))
@@ -338 +345 @@
     post_count = models.IntegerField(_('Post count'), blank=True, default=0)
 
+    objects = ProfileManager()
+
     class Meta:
         verbose_name = _('Profile')

djangobb_forum/views.py

@@ -261 +261 @@
         topic.update_read(request.user)
     posts = topic.posts.all().select_related()
-    #TODO rewrite
-    fixed = False
-    if fixed and forum_settings.REPUTATION_SUPPORT:
-        replies_list = Reputation.objects.filter(to_user__pk__in=users).values('to_user_id').annotate(Sum('sign'))
-        replies = {}
-        for r in replies_list:
-            replies[r['to_user_id']] = r['sign__sum']
-
-        for post in posts:
-            post.user.forum_profile.reply_total = replies.get(post.user.id, 0)
 
     initial = {}
@@ -541 +531 @@
     posts = topic.posts.all().select_related()
 
-    profiles = Profile.objects.filter(user__pk__in=set(x.user.id for x in posts))
-    profiles = dict((x.user_id, x) for x in profiles)
-
-    for post in posts:
-        post.user.forum_profile = profiles[post.user.id]
-
     initial = {}
     if request.user.is_authenticated():