IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: 1000 was a crazy threshold for showing categories at the bottom of

Browse Source 
digests
This commit is contained in:
Robin Ward 2014-11-07 17:16:52 -05:00
parent bfe2021859
commit 0777efe74d
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/mailers/user_notifications.rb
View File

@ -54,7 +54,7 @@ class UserNotifications < ActionMailer::Base
featured_topic_ids = @featured_topics.map(&:id) featured_topic_ids = @featured_topics.map(&:id)
@new_topics_since_seen = Topic.new_since_last_seen(user, min_date, featured_topic_ids).count @new_topics_since_seen = Topic.new_since_last_seen(user, min_date, featured_topic_ids).count
if @new_topics_since_seen > 1000 if @new_topics_since_seen > SiteSetting.digest_topics
category_counts = Topic.new_since_last_seen(user, min_date, featured_topic_ids).group(:category_id).count category_counts = Topic.new_since_last_seen(user, min_date, featured_topic_ids).group(:category_id).count
@new_by_category = [] @new_by_category = []

4
app/views/user_notifications/digest.html.erb
View File

@ -56,7 +56,9 @@
<p><%= t('user_notifications.digest.more_topics_category', last_seen_at: @last_seen_at, new_topics_since_seen: @new_topics_since_seen) %></p> <p><%= t('user_notifications.digest.more_topics_category', last_seen_at: @last_seen_at, new_topics_since_seen: @new_topics_since_seen) %></p>
<div> <div>
<%- @new_by_category.each do |c| %> <%- @new_by_category.each do |c| %>
<span style="margin-bottom: 8px; margin-right: 10px; display: inline-block;"><%= email_category(c[0], show_uncategorized: true) %> x <%= c[1] %></span> <span style='white-space: nowrap'>
<b><%= c[0].name %></b> <span style='color: #777; margin: 0 10px 0 5px; font-size: 0.9em;'> <%= c[1] %></span>
</span>
<%- end %> <%- end %>
</div> </div>
<%- else %> <%- else %>