app/views/commontator/shared/_thread.html.erb in commontator-6.0.0.pre.1 vs app/views/commontator/shared/_thread.html.erb in commontator-6.0.0.pre.2
- old
+ new
@@ -1,10 +1,9 @@
<%
# Controllers that use this partial must supply the following variables:
# thread
# user
- # per_page
# page
# show_all
# Additionally, they may override the following variable:
@commontator_thread_show ||= false
%>
@@ -12,21 +11,17 @@
<% if !thread.nil? && thread.can_be_read_by?(user) %>
<div id="commontator-thread-<%= thread.id %>" class="commontator thread">
<% if @commontator_thread_show %>
<%=
render partial: 'commontator/threads/show', locals: {
- thread: thread,
- user: user,
- page: page,
- per_page: per_page,
- show_all: show_all
+ thread: thread, user: user, page: page, show_all: show_all
}
%>
<% else %>
<% subscription = thread.subscription_for(user) %>
<%= link_to "#{t 'commontator.thread.actions.show'} (#{
- (subscription.unread_comments.count.to_s + '/') if subscription
- }#{thread.filtered_comments.count.to_s})",
+ (subscription.unread_comments(show_all).count.to_s + '/') if subscription
+ }#{thread.filtered_comments(show_all).count.to_s})",
commontator.thread_path(thread),
remote: true %>
<% end %>
</div>
<% end %>