Commit 2ab53dfb1cc7f811e9a98aa42f3b30fc9d4f1012
Exists in
spb-stable
and in
3 other branches
Merge branch 'issue_search_filter' into 'master'
Fix reset of issue search on submit
Showing
1 changed file
with
5 additions
and
0 deletions
Show diff stats
app/views/projects/issues/_head.html.haml
| @@ -20,6 +20,11 @@ | @@ -20,6 +20,11 @@ | ||
| 20 | = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-left issue-search-form' do | 20 | = form_tag project_issues_path(@project), method: :get, id: "issue_search_form", class: 'pull-left issue-search-form' do |
| 21 | .append-right-10.hidden-xs.hidden-sm | 21 | .append-right-10.hidden-xs.hidden-sm |
| 22 | = search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' } | 22 | = search_field_tag :issue_search, nil, { placeholder: 'Filter by title or description', class: 'form-control issue_search search-text-input input-mn-300' } |
| 23 | + = hidden_field_tag :state, params['state'] | ||
| 24 | + = hidden_field_tag :scope, params['scope'] | ||
| 25 | + = hidden_field_tag :assignee_id, params['assignee_id'] | ||
| 26 | + = hidden_field_tag :milestone_id, params['milestone_id'] | ||
| 27 | + = hidden_field_tag :label_id, params['label_id'] | ||
| 23 | - if can? current_user, :write_issue, @project | 28 | - if can? current_user, :write_issue, @project |
| 24 | = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-left", title: "New Issue", id: "new_issue_link" do | 29 | = link_to new_project_issue_path(@project, issue: { assignee_id: params[:assignee_id], milestone_id: params[:milestone_id]}), class: "btn btn-new pull-left", title: "New Issue", id: "new_issue_link" do |
| 25 | %i.icon-plus | 30 | %i.icon-plus |