Просмотр исходного кода

Little tweak in tracking reads

Ralfp 12 лет назад
Родитель
Сommit
b8595cd844
3 измененных файлов с 5 добавлено и 5 удалено
  1. 1 1
      misago/forums/models.py
  2. 3 3
      misago/threads/models.py
  3. 1 1
      misago/threads/views/thread.py

+ 1 - 1
misago/forums/models.py

@@ -176,7 +176,7 @@ class Forum(MPTTModel):
 
     def sync(self):
         self.threads = self.thread_set.filter(moderated=False).filter(deleted=False).count()
-        self.posts = self.post_set.filter(moderated=False).filter(deleted=False).count()
+        self.posts = self.post_set.filter(moderated=False).count()
         self.last_poster = None
         self.last_poster_name = None
         self.last_poster_slug = None

+ 3 - 3
misago/threads/models.py

@@ -59,7 +59,7 @@ class Thread(models.Model):
 
     def sync(self):
         # Counters
-        self.replies = self.post_set.filter(moderated=False).filter(deleted=False).count() - 1
+        self.replies = self.post_set.filter(moderated=False).count() - 1
         if self.replies < 0:
             self.replies = 0
         self.replies_reported = self.post_set.filter(reported=True).count()
@@ -75,9 +75,9 @@ class Thread(models.Model):
         self.start_poster_style = start_post.user.rank.style if start_post.user else ''
         self.upvotes = start_post.upvotes
         self.downvotes = start_post.downvotes
-        # Last post
+        # Last visible post
         if self.replies > 0:
-            last_post = self.post_set.order_by('-merge', '-id').filter(moderated=False).filter(deleted=False)[0:][0]
+            last_post = self.post_set.order_by('-merge', '-id').filter(moderated=False)[0:][0]
         else:
             last_post = start_post
         self.last = last_post.date

+ 1 - 1
misago/threads/views/thread.py

@@ -52,7 +52,7 @@ class ThreadView(BaseView):
         for post in self.posts:
             posts_dict[post.pk] = post
             post.message = self.request.messages.get_message('threads_%s' % post.pk)
-            post.is_read = post.date <= self.read_date or (post.pk != self.thread.start_post_id and (post.deleted or post.moderated))
+            post.is_read = post.date <= self.read_date or (post.pk != self.thread.start_post_id and post.moderated)
             post.karma_vote = None
             post.ignored = self.thread.start_post_id != post.pk and not self.thread.pk in self.request.session.get('unignore_threads', []) and post.user_id in ignored_users
             if post.ignored: