diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-04 15:18:08 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-04 15:18:08 +0000 |
| commit | 2d006b463850599377334cb3b76aa08eebfd8fa0 (patch) | |
| tree | 9adf6744920701b9f409671581a88af80c22ed9e /app/helpers | |
| parent | d6733662da689378463f9abf62532e9d09a59739 (diff) | |
| parent | c13c1e1b166edd5520057814dc4698450b578c9a (diff) | |
| download | gitlab-ce-2d006b463850599377334cb3b76aa08eebfd8fa0.tar.gz | |
Merge branch 'dashboard-filter-search-keep-params' into 'master'
Fixes filtering by name reseting archive filter
Closes #28007
See merge request !9625
Diffstat (limited to 'app/helpers')
| -rw-r--r-- | app/helpers/explore_helper.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/helpers/explore_helper.rb b/app/helpers/explore_helper.rb index bbcb52f7eaf..7bd212a3ef9 100644 --- a/app/helpers/explore_helper.rb +++ b/app/helpers/explore_helper.rb @@ -1,14 +1,19 @@ module ExploreHelper def filter_projects_path(options = {}) exist_opts = { - sort: params[:sort], + sort: params[:sort] || @sort, scope: params[:scope], group: params[:group], tag: params[:tag], visibility_level: params[:visibility_level], + name: params[:name], + personal: params[:personal], + archived: params[:archived], + shared: params[:shared], + namespace_id: params[:namespace_id], } - options = exist_opts.merge(options) + options = exist_opts.merge(options).delete_if { |key, value| value.blank? } request_path_with_options(options) end |