github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-03 13:14:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2908 from cpradio/pr-dismiss-posts-topics-on-category

Browse Source 
FEATURE: Show dismiss posts/topics buttons on category filtered lists
This commit is contained in:
Sam
2014-10-31 11:34:53 +11:00
parent 2251877332 50f7fbc361
commit bd78fca121
3 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/topics_controller.rb
View File

@ -364,7 +364,9 @@ class TopicsController < ApplicationController
topic_ids = params[:topic_ids].map {|t| t.to_i}
elsif params[:filter] == 'unread'
tq = TopicQuery.new(current_user)
topic_ids = TopicQuery.unread_filter(tq.joined_topic_user).listable_topics.pluck(:id)
topics = TopicQuery.unread_filter(tq.joined_topic_user).listable_topics
topics = topics.where('category_id = ?', params[:category_id]) if params[:category_id]
topic_ids = topics.pluck(:id)
else
raise ActionController::ParameterMissing.new(:topic_ids)
end