summaryrefslogtreecommitdiff
path: root/app/controllers/application_controller.rb
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-24 11:39:03 +0200
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2014-12-24 11:39:03 +0200
commit7b792af872699cd9439c750b780b0b906342cff0 (patch)
tree5a610555b0b2c750866494794e7853efe0b9927d /app/controllers/application_controller.rb
parent016981c009a2a8c6066085300a838d9c9d6bfd5d (diff)
downloadgitlab-ce-7b792af872699cd9439c750b780b0b906342cff0.tar.gz
Improvements to issues/mr filters:
* use filter_params variable when set filter values * fix project issues spinach tests Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'app/controllers/application_controller.rb')
-rw-r--r--app/controllers/application_controller.rb8
1 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 79824116b41..1b48572f2b8 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -263,11 +263,11 @@ class ApplicationController < ActionController::Base
end
def set_filter_values(collection)
- assignee_id = params[:assignee_id]
- author_id = params[:author_id]
- milestone_id = params[:milestone_id]
+ assignee_id = @filter_params[:assignee_id]
+ author_id = @filter_params[:author_id]
+ milestone_id = @filter_params[:milestone_id]
- @sort = params[:sort].try(:humanize)
+ @sort = @filter_params[:sort].try(:humanize)
@assignees = User.where(id: collection.pluck(:assignee_id))
@authors = User.where(id: collection.pluck(:author_id))
@milestones = Milestone.where(id: collection.pluck(:milestone_id))