From 418e95bd5f623c4cbeac8f5c2fdf2a50e8893339 Mon Sep 17 00:00:00 2001 From: barthc Date: Mon, 27 Jun 2016 21:22:19 +0100 Subject: fix issues mr counter --- app/controllers/concerns/issuable_collections.rb | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'app/controllers/concerns/issuable_collections.rb') diff --git a/app/controllers/concerns/issuable_collections.rb b/app/controllers/concerns/issuable_collections.rb index b5e79099e39..4a447735fa7 100644 --- a/app/controllers/concerns/issuable_collections.rb +++ b/app/controllers/concerns/issuable_collections.rb @@ -13,10 +13,18 @@ module IssuableCollections issues_finder.execute end + def all_issues_collection + IssuesFinder.new(current_user, filter_params_all).execute + end + def merge_requests_collection merge_requests_finder.execute end + def all_merge_requests_collection + MergeRequestsFinder.new(current_user, filter_params_all).execute + end + def issues_finder @issues_finder ||= issuable_finder_for(IssuesFinder) end @@ -54,6 +62,10 @@ module IssuableCollections @filter_params end + def filter_params_all + @filter_params_all ||= filter_params.merge(state: 'all', sort: nil) + end + def set_default_scope params[:scope] = 'all' if params[:scope].blank? end -- cgit v1.2.1