From 50f7fbc36121c34a59b1a99c4565df093ccfd483 Mon Sep 17 00:00:00 2001 From: cpradio Date: Thu, 30 Oct 2014 10:19:49 -0400 Subject: [PATCH] Apply comment from @sam to consolidate logic --- app/controllers/topics_controller.rb | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb index ee03c40d742..e7b39785334 100644 --- a/app/controllers/topics_controller.rb +++ b/app/controllers/topics_controller.rb @@ -359,11 +359,9 @@ class TopicsController < ApplicationController topic_ids = params[:topic_ids].map {|t| t.to_i} elsif params[:filter] == 'unread' tq = TopicQuery.new(current_user) - if params[:category_id] - topic_ids = TopicQuery.unread_filter(tq.joined_topic_user).listable_topics.where('category_id = ?', params[:category_id]).pluck(:id) - else - topic_ids = TopicQuery.unread_filter(tq.joined_topic_user).listable_topics.pluck(:id) - end + 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