Remember last sort option used.

1 files changed, 21 insertions, 1 deletions

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 633c3f55614..4c4e2ac3d3c 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -297,7 +297,8 @@ class ApplicationController < ActionController::Base
   end
 
   def set_filters_params
-    params[:sort] ||= 'id_desc'
+    set_default_sort
+
     params[:scope] = 'all' if params[:scope].blank?
     params[:state] = 'opened' if params[:state].blank?
 
@@ -404,4 +405,23 @@ class ApplicationController < ActionController::Base
 
     current_user.nil? && root_path == request.path
   end
+
+  private
+
+  def set_default_sort
+    controller_name = params[:controller].sub(/Controller\Z/, '').underscore
+    cookie_suffix = "_sort_#{controller_name}"
+
+    key = if @project
+            "#{@project.cookie_key}#{cookie_suffix}"
+          elsif @group
+            "#{@group.cookie_key}#{cookie_suffix}"
+          else
+            "#{current_user.cookie_key}#{cookie_suffix}"
+          end
+
+    cookies[key] ||= 'id_desc'
+    cookies[key] = params[:sort] if params[:sort].present?
+    params[:sort] = cookies[key]
+  end
 end