Merge branch 'read-forum'

2014-03-14 18:39:49 -07:00
parent 49bdc7cd79 7e07b874a4
commit ea8c43a972
6 changed files with 84 additions and 11 deletions
--- a/app/views/forum_topics/index.html.erb
+++ b/app/views/forum_topics/index.html.erb
@@ -24,7 +24,7 @@
                <span class="sticky">Sticky:</span>
              <% end %>

-              <% if topic.updated_at > (CurrentUser.last_forum_read_at || Time.now) %>
+              <% unless topic.read_by?(CurrentUser.user, @read_forum_topic_ids) %>
                <span class="new">NEW</span>
              <% end %>