diff options
| author | Phil Hughes <me@iamphill.com> | 2016-03-18 12:21:07 +0000 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-03-18 12:21:07 +0000 |
| commit | 257ce802d0107899a6875f23d4bb959ba1aa0053 (patch) | |
| tree | 222a1a1e9d6f73116050fd5eb781258b0a2399dd | |
| parent | fde975facc37c7d2f7ea5c997624bc7c0f5759a8 (diff) | |
| download | gitlab-ce-filter-label-missing.tar.gz | |
Fixes issue with filter label missing on labels & milestonesfilter-label-missing
| -rw-r--r-- | app/views/shared/issuable/_filter.html.haml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/shared/issuable/_filter.html.haml b/app/views/shared/issuable/_filter.html.haml index dfdc84ba4cc..abe5aeb874c 100644 --- a/app/views/shared/issuable/_filter.html.haml +++ b/app/views/shared/issuable/_filter.html.haml @@ -21,7 +21,7 @@ .filter-item.inline.milestone-filter - if params[:milestone_title] = hidden_field_tag(:milestone_title, params[:milestone_title]) - = dropdown_tag(h(params[:milestone_name] || "Milestone"), options: { title: "Filter by milestone", toggle_class: 'js-milestone-select js-filter-submit', filter: true, dropdown_class: "dropdown-menu-selectable", + = dropdown_tag(h((params[:milestone_title] if params[:milestone_title].present?) || "Milestone"), options: { title: "Filter by milestone", toggle_class: 'js-milestone-select js-filter-submit', filter: true, dropdown_class: "dropdown-menu-selectable", placeholder: "Search milestones", footer_content: true, data: { show_no: true, show_any: true, field_name: "milestone_title", selected: params[:milestone_title], project_id: (@project.id if @project), milestones: (namespace_project_milestones_path(@project.namespace, @project, :js) if @project) } }) do - if @project %ul.dropdown-footer-list @@ -42,7 +42,7 @@ .dropdown %button.dropdown-menu-toggle.js-label-select.js-filter-submit{type: "button", data: {toggle: "dropdown", field_name: "label_name", show_no: "true", show_any: "true", selected: params[:label_name], project_id: (@project.id if @project), labels: (namespace_project_labels_path(@project.namespace, @project, :js) if @project)}} %span.dropdown-toggle-text - = h(params[:label_name] || "Label") + = h((params[:label_name] if params[:label_name].present?) || "Label") = icon('chevron-down') .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable .dropdown-page-one |