diff options
| author | Sam Rose <sam@gitlab.com> | 2016-12-15 18:07:41 +0300 |
|---|---|---|
| committer | Sam Rose <sam@gitlab.com> | 2016-12-21 15:34:58 +0300 |
| commit | 804198ab7f1bdd854c64da729a04fc65f2b6ff7d (patch) | |
| tree | 8b5f1201a9fd1ed0b49bd37687996494f9689ed2 /app/views | |
| parent | ffcf1565089e36681cb0a75d5b51955b5b87ab78 (diff) | |
Maintain milestone filter option when updating filter
Setup teaspoon tests for Issuable
Diffstat (limited to 'app/views')
| -rw-r--r-- | app/views/shared/issuable/_milestone_dropdown.html.haml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/shared/issuable/_milestone_dropdown.html.haml b/app/views/shared/issuable/_milestone_dropdown.html.haml index 40fe53e6a8d..415361f8fbf 100644 --- a/app/views/shared/issuable/_milestone_dropdown.html.haml +++ b/app/views/shared/issuable/_milestone_dropdown.html.haml @@ -3,7 +3,7 @@ - show_menu_above = show_menu_above || false - selected_text = selected.try(:title) || params[:milestone_title] - dropdown_title = local_assigns.fetch(:dropdown_title, "Filter by milestone") -- if selected.present? +- if selected.present? || params[:milestone_title].present? = hidden_field_tag(name, name == :milestone_title ? selected_text : selected.id) = dropdown_tag(milestone_dropdown_label(selected_text), options: { title: dropdown_title, toggle_class: "js-milestone-select js-filter-submit #{extra_class}", filter: true, dropdown_class: "dropdown-menu-selectable dropdown-menu-milestone", placeholder: "Search milestones", footer_content: project.present?, data: { show_no: true, show_menu_above: show_menu_above, show_any: show_any, show_upcoming: show_upcoming, field_name: name, selected: selected.try(:title), project_id: project.try(:id), milestones: milestones_filter_dropdown_path, default_label: "Milestone" } }) do |