diff options
| author | Felipe Artur <felipefac@gmail.com> | 2016-04-22 16:50:53 -0300 |
|---|---|---|
| committer | Felipe Artur <felipefac@gmail.com> | 2016-04-22 16:50:53 -0300 |
| commit | e7c268a26ea2a1da4a52c49bf43f33bdf6acaeda (patch) | |
| tree | 5f9d5bd5b0433d2ba3e86e031f87370fb3b7536d /app/controllers/application_controller.rb | |
| parent | d83d43c553281718749da1f18edc8e254264c059 (diff) | |
| download | gitlab-ce-issue_15221.tar.gz | |
Persists search filter state per project/groupissue_15221
Diffstat (limited to 'app/controllers/application_controller.rb')
| -rw-r--r-- | app/controllers/application_controller.rb | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 1c53b0b21a3..aeefafcb8f8 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -6,6 +6,7 @@ class ApplicationController < ActionController::Base include Gitlab::GonHelper include GitlabRoutingHelper include PageLayoutHelper + include SearchCookies before_action :authenticate_user_from_token! before_action :authenticate_user! @@ -354,24 +355,4 @@ class ApplicationController < ActionController::Base current_user.nil? && root_path == request.path end - - private - - def set_default_sort - key = if is_a_listing_page_for?('issues') || is_a_listing_page_for?('merge_requests') - 'issuable_sort' - end - - cookies[key] = params[:sort] if key && params[:sort].present? - params[:sort] = cookies[key] if key - params[:sort] ||= 'id_desc' - end - - def is_a_listing_page_for?(page_type) - controller_name, action_name = params.values_at(:controller, :action) - - (controller_name == "projects/#{page_type}" && action_name == 'index') || - (controller_name == 'groups' && action_name == page_type) || - (controller_name == 'dashboard' && action_name == page_type) - end end |