diff options
author | Phil Hughes <me@iamphill.com> | 2017-03-01 16:17:26 +0000 |
---|---|---|
committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2017-03-03 16:37:28 +0200 |
commit | ed1f110499d8e2aa011e17f1ad8a038e209842fb (patch) | |
tree | 53e18f4c98ab130bd1d8b2364fac1773771505e2 /app/views/groups | |
parent | b18646040c9b17c69ac66fb687b02450e161808c (diff) | |
download | gitlab-ce-ed1f110499d8e2aa011e17f1ad8a038e209842fb.tar.gz |
Fixes filtering by name reseting archive filter
Previously the search form just wasn't including any params that had previously been set, so when you filtered by name, it would reset all the params & therefore ignoring the archived param
Closes #28007
Diffstat (limited to 'app/views/groups')
-rw-r--r-- | app/views/groups/show.html.haml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/views/groups/show.html.haml b/app/views/groups/show.html.haml index 8f0f2708194..5a7b0c1534b 100644 --- a/app/views/groups/show.html.haml +++ b/app/views/groups/show.html.haml @@ -11,8 +11,9 @@ .top-area = render 'groups/show_nav' .nav-controls - = form_tag request.path, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f| - = search_field_tag :filter_projects, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false + = form_tag request.fullpath, method: :get, class: 'project-filter-form', id: 'project-filter-form' do |f| + = render "shared/projects/filter_fields" + = search_field_tag :name, nil, placeholder: 'Filter by name', class: 'projects-list-filter form-control', spellcheck: false = render 'shared/projects/dropdown' - if can? current_user, :create_projects, @group = link_to new_project_path(namespace_id: @group.id), class: 'btn btn-new pull-right' do |