Merge pull request #461 from flaskbb/fix-readtracker-in-topictracker

Fix readtracker in TopicTracker

flaskbb/forum/views.py

@@ -578,8 +578,16 @@ class TopicTracker(MethodView):
                     TopicsRead.user_id == real(current_user).id
                 )).\
             outerjoin(Post, Topic.last_post_id == Post.id).\
+            outerjoin(Forum, Topic.forum_id == Forum.id).\
+            outerjoin(
+                ForumsRead,
+                db.and_(
+                    ForumsRead.forum_id == Forum.id,
+                    ForumsRead.user_id == real(current_user).id
+                )).\
             add_entity(Post).\
             add_entity(TopicsRead).\
+            add_entity(ForumsRead).\
             order_by(Topic.last_updated.desc()).\
             paginate(page, flaskbb_config['TOPICS_PER_PAGE'], True)
 

flaskbb/templates/forum/topictracker.html

@@ -35,7 +35,7 @@
                     <div class="col-md-1 col-sm-1 col-xs-2 topic-select-all"><input type="checkbox" name="rowtoggle" class="action-checkall" title="Select All"/></div>
                 </div>
 
-                {% for topic, last_post, topicread in topics.items %}
+                {% for topic, last_post, topicread, forumsread in topics.items %}
                 <div class="row forum-row hover clearfix">
 
                     <div class="col-md-4 col-sm-4 col-xs-6 topic-info">