mirror of
https://github.com/discourse/discourse.git
synced 2025-02-07 20:08:26 +00:00
Apply comment from @sam to consolidate logic
This commit is contained in:
parent
c6e54741bb
commit
50f7fbc361
@ -359,11 +359,9 @@ class TopicsController < ApplicationController
|
|||||||
topic_ids = params[:topic_ids].map {|t| t.to_i}
|
topic_ids = params[:topic_ids].map {|t| t.to_i}
|
||||||
elsif params[:filter] == 'unread'
|
elsif params[:filter] == 'unread'
|
||||||
tq = TopicQuery.new(current_user)
|
tq = TopicQuery.new(current_user)
|
||||||
if params[:category_id]
|
topics = TopicQuery.unread_filter(tq.joined_topic_user).listable_topics
|
||||||
topic_ids = TopicQuery.unread_filter(tq.joined_topic_user).listable_topics.where('category_id = ?', params[:category_id]).pluck(:id)
|
topics = topics.where('category_id = ?', params[:category_id]) if params[:category_id]
|
||||||
else
|
topic_ids = topics.pluck(:id)
|
||||||
topic_ids = TopicQuery.unread_filter(tq.joined_topic_user).listable_topics.pluck(:id)
|
|
||||||
end
|
|
||||||
else
|
else
|
||||||
raise ActionController::ParameterMissing.new(:topic_ids)
|
raise ActionController::ParameterMissing.new(:topic_ids)
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user