diff options
| author | Jacob Schatz <jschatz1@gmail.com> | 2016-04-13 13:24:44 +0000 |
|---|---|---|
| committer | Jacob Schatz <jschatz1@gmail.com> | 2016-04-13 13:24:44 +0000 |
| commit | f026e53c4df5b0b3bb7435c05d3c8662afe45881 (patch) | |
| tree | 14221dac3a8d8ba973d0970059dc8de930b1d51c /app | |
| parent | c74604699269a2edbbe937309cce7a4ed789cb07 (diff) | |
| parent | a6ba94dbd109637b996246601f1bc2b62dc0a8d7 (diff) | |
| download | gitlab-ce-f026e53c4df5b0b3bb7435c05d3c8662afe45881.tar.gz | |
Merge branch 'label-filter' into 'master'
Fixed not being able to filter by any or no labels
Brings back the options to filter by any or no label
Closes #15008
See merge request !3589
Diffstat (limited to 'app')
| -rw-r--r-- | app/assets/javascripts/labels_select.js.coffee | 2 | ||||
| -rw-r--r-- | app/views/shared/issuable/_label_dropdown.html.haml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/assets/javascripts/labels_select.js.coffee b/app/assets/javascripts/labels_select.js.coffee index d1fe116397a..90385621879 100644 --- a/app/assets/javascripts/labels_select.js.coffee +++ b/app/assets/javascripts/labels_select.js.coffee @@ -218,7 +218,7 @@ class @LabelsSelect selectable: true toggleLabel: (selected) -> - if selected and selected.title isnt 'Any Label' + if selected and selected.title? selected.title else defaultLabel diff --git a/app/views/shared/issuable/_label_dropdown.html.haml b/app/views/shared/issuable/_label_dropdown.html.haml index fd5e58c1f1f..f722e61eeac 100644 --- a/app/views/shared/issuable/_label_dropdown.html.haml +++ b/app/views/shared/issuable/_label_dropdown.html.haml @@ -1,7 +1,7 @@ - if params[:label_name].present? = hidden_field_tag(:label_name, params[:label_name]) .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.try(:id), labels: labels_filter_path, default_label: "Label"}} + %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"}} %span.dropdown-toggle-text = h(params[:label_name].presence || "Label") = icon('chevron-down') |