Fix issuable state caching

We were including controller params in the cache key, so the key for the header
didn't match the one for the list itself!
This commit is contained in:
Sean McGivern 2017-07-11 17:11:41 +01:00
parent c57ae83dcf
commit b3a588bcca
2 changed files with 3 additions and 7 deletions

View file

@ -32,10 +32,10 @@ module IssuableCollections
def filter_params
set_sort_order_from_cookie
set_default_scope
set_default_state
@filter_params = params.dup
# Skip irrelevant Rails routing params
@filter_params = params.dup.except(:controller, :action, :namespace_id)
@filter_params[:sort] ||= default_sort_order
@sort = @filter_params[:sort]
@ -55,10 +55,6 @@ module IssuableCollections
@filter_params
end
def set_default_scope
params[:scope] = 'all' if params[:scope].blank?
end
def set_default_state
params[:state] = 'opened' if params[:state].blank?
end

View file

@ -22,7 +22,7 @@ class IssuableFinder
include CreatedAtFilter
NONE = '0'.freeze
IRRELEVANT_PARAMS_FOR_CACHE_KEY = %i[utf8 sort page].freeze
IRRELEVANT_PARAMS_FOR_CACHE_KEY = %i[utf8 sort page state].freeze
attr_accessor :current_user, :params