Browse Source

Readstracker fixed and get_read_date renamed to read_date

Ralfp 12 years ago
parent
commit
32ff9a33c0

+ 1 - 1
misago/apps/oldthreads/views/jumps.py

@@ -62,7 +62,7 @@ class NewReplyView(JumpView):
         if not self.request.user.is_authenticated():
         if not self.request.user.is_authenticated():
             return self.redirect(self.thread.post_set.order_by('-id')[:1][0])
             return self.redirect(self.thread.post_set.order_by('-id')[:1][0])
         tracker = ThreadsTracker(self.request, self.forum)
         tracker = ThreadsTracker(self.request, self.forum)
-        read_date = tracker.get_read_date(self.thread)
+        read_date = tracker.read_date(self.thread)
         post = self.thread.post_set.filter(date__gt=read_date).order_by('id')[:1]
         post = self.thread.post_set.filter(date__gt=read_date).order_by('id')[:1]
         if not post:
         if not post:
             return self.redirect(self.thread.post_set.order_by('-id')[:1][0])
             return self.redirect(self.thread.post_set.order_by('-id')[:1][0])

+ 1 - 1
misago/apps/oldthreads/views/thread.py

@@ -43,7 +43,7 @@ class ThreadView(BaseView):
         self.pagination = make_pagination(page, self.count, self.request.settings.posts_per_page)
         self.pagination = make_pagination(page, self.count, self.request.settings.posts_per_page)
         if self.request.settings.posts_per_page < self.count:
         if self.request.settings.posts_per_page < self.count:
             self.posts = self.posts[self.pagination['start']:self.pagination['stop']]
             self.posts = self.posts[self.pagination['start']:self.pagination['stop']]
-        self.read_date = self.tracker.get_read_date(self.thread)
+        self.read_date = self.tracker.read_date(self.thread)
         ignored_users = []
         ignored_users = []
         if self.request.user.is_authenticated():
         if self.request.user.is_authenticated():
             ignored_users = self.request.user.ignored_users()
             ignored_users = self.request.user.ignored_users()

+ 7 - 7
misago/readstrackers.py

@@ -41,7 +41,7 @@ class ThreadsTracker(object):
                 self.record = ForumRead(user=request.user, forum=forum, cleared=self.cutoff)
                 self.record = ForumRead(user=request.user, forum=forum, cleared=self.cutoff)
             self.threads = self.record.get_threads()
             self.threads = self.record.get_threads()
 
 
-    def get_read_date(self, thread):
+    def read_date(self, thread):
         if not self.request.user.is_authenticated():
         if not self.request.user.is_authenticated():
             return timezone.now()
             return timezone.now()
         try:
         try:
@@ -63,7 +63,7 @@ class ThreadsTracker(object):
         if self.request.user.is_authenticated() and post.date > self.cutoff:
         if self.request.user.is_authenticated() and post.date > self.cutoff:
             try:
             try:
                 self.threads[thread.pk].updated = post.date
                 self.threads[thread.pk].updated = post.date
-                self.need_update = thread
+                self.need_update = self.threads[thread.pk]
             except KeyError:
             except KeyError:
                 self.need_create = thread
                 self.need_create = thread
 
 
@@ -72,11 +72,11 @@ class ThreadsTracker(object):
 
 
         if self.need_create:
         if self.need_create:
             new_record = ThreadRead(
             new_record = ThreadRead(
-                                      user=self.request.user,
-                                      thread=self.need_create,
-                                      forum=self.forum,
-                                      updated=now
-                                      )
+                                    user=self.request.user,
+                                    thread=self.need_create,
+                                    forum=self.forum,
+                                    updated=now
+                                    )
             new_record.save(force_insert=True)
             new_record.save(force_insert=True)
             self.threads[new_record.thread_id] = new_record
             self.threads[new_record.thread_id] = new_record