Resolve "Separate remembering sorting issues/merge requests"

1 files changed, 12 insertions, 10 deletions

diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb
index 2ef2ee76855..22b39f47bf0 100644
--- a/app/controllers/concerns/issuable_collections.rb
+++ b/app/controllers/concerns/issuable_collections.rb
@@ -107,11 +107,15 @@ module IssuableCollections
   end
 
   def set_sort_order_from_cookie
-    key = 'issuable_sort'
+    cookies[remember_sorting_key] = params[:sort] if params[:sort].present?
+    # fallback to legacy cookie value for backward compatibility
+    cookies[remember_sorting_key] ||= cookies['issuable_sort']
+    cookies[remember_sorting_key] = update_cookie_value(cookies[remember_sorting_key])
+    params[:sort] = cookies[remember_sorting_key]
+  end
 
-    cookies[key] = params[:sort] if params[:sort].present?
-    cookies[key] = update_cookie_value(cookies[key])
-    params[:sort] = cookies[key]
+  def remember_sorting_key
+    @remember_sorting_key ||= "#{collection_type.downcase}_sort"
   end
 
   def default_sort_order
@@ -140,16 +144,14 @@ module IssuableCollections
   end
 
   def finder
-    strong_memoize(:finder) do
-      issuable_finder_for(finder_type)
-    end
+    @finder ||= issuable_finder_for(finder_type)
   end
 
   def collection_type
-    @collection_type ||= case finder
-                         when IssuesFinder
+    @collection_type ||= case finder_type.name
+                         when 'IssuesFinder'
                            'Issue'
-                         when MergeRequestsFinder
+                         when 'MergeRequestsFinder'
                            'MergeRequest'
                          end
   end