diff options
| author | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 17:10:10 -0500 |
|---|---|---|
| committer | Alfredo Sumaran <alfredo@gitlab.com> | 2016-04-20 17:10:10 -0500 |
| commit | 7e0ef892f4d2a775474a1779de4ce3f54c0dbc10 (patch) | |
| tree | 73d9719d4dd32b48529991288eaf70f9a5228bba /app/views/shared/issuable/_label_dropdown.html.haml | |
| parent | a5290ac296ab4f3241827bf036c2c6678722d79c (diff) | |
| parent | 7e6d59067eb614a139cfa438d4c9f9f9f5368a47 (diff) | |
| download | gitlab-ce-7e0ef892f4d2a775474a1779de4ce3f54c0dbc10.tar.gz | |
Merge remote-tracking branch 'origin/master' into label-dropdown-fixlabel-dropdown-fix
Diffstat (limited to 'app/views/shared/issuable/_label_dropdown.html.haml')
| -rw-r--r-- | app/views/shared/issuable/_label_dropdown.html.haml | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml index ec0cb78fac0..61fd1e9c335 100644 --- a/app/views/shared/issuable/_label_dropdown.html.haml +++ b/app/views/shared/issuable/_label_dropdown.html.haml @@ -1,9 +1,11 @@ - if params[:label_name].present? - = hidden_field_tag(:label_name, params[:label_name]) + - if params[:label_name].respond_to?('any?') + - params[:label_name].each do |label| + = hidden_field_tag "label_name[]", label, id: nil .dropdown - %button.dropdown-menu-toggle.js-label-select.js-filter-submit.js-extra-options{type: "button", data: {toggle: "dropdown", field_name: "label_name", show_no: "true", show_any: "true", selected: params[:label_name], project_id: @project.try(:id), labels: labels_filter_path, default_label: "Label"}} + %button.dropdown-menu-toggle.js-label-select.js-filter-submit.js-multiselect.js-extra-options{type: "button", data: {toggle: "dropdown", field_name: "label_name[]", show_no: "true", show_any: "true", selected: params[:label_name], project_id: @project.try(:id), labels: labels_filter_path, default_label: "Label"}} %span.dropdown-toggle-text - = h(params[:label_name].presence || "Label") + = h(multi_label_name(params[:label_name], "Label")) = icon('chevron-down') .dropdown-menu.dropdown-select.dropdown-menu-paging.dropdown-menu-labels.dropdown-menu-selectable = render partial: "shared/issuable/label_page_default", locals: { title: "Filter by label" } |