summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFatih Acet <acetfatih@gmail.com>2016-10-19 21:18:19 +0000
committerFatih Acet <acetfatih@gmail.com>2016-10-19 21:18:19 +0000
commit4deafb9e2eba783715fcea83f8db52108464a592 (patch)
treec6e75b4c9ae00222262ab2ec71e563c53b2d7a56
parent25ff16459c7e5b632278ee11a19a3930f91f44ec (diff)
parent4e028d333bbbcafcd89b04778b0b37775b6015c4 (diff)
downloadgitlab-ce-4deafb9e2eba783715fcea83f8db52108464a592.tar.gz
Merge branch '23375-filtering-on-any-label-or-no-label-does-not-work' into 'master'
Fix 'No label' and 'Any label' filters ## What does this MR do? Returns the `title`as the `id` for `No label`. ## Are there points in the code the reviewer needs to double check? ## Why was this MR needed? Label filters not working as expected ## Screenshots (if relevant) ![2016-10-19_04.58.08](/uploads/3b079bf28299c1155e0243171ac008f6/2016-10-19_04.58.08.gif) ## Does this MR meet the acceptance criteria? - [ ] [CHANGELOG](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CHANGELOG) entry added - [ ] [Documentation created/updated](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/doc/development/doc_styleguide.md) - [ ] API support added - Tests - [ ] Added for this feature/bug - [ ] All builds are passing - [ ] Conform by the [merge request performance guides](http://docs.gitlab.com/ce/development/merge_request_performance_guidelines.html) - [ ] Conform by the [style guides](https://gitlab.com/gitlab-org/gitlab-ce/blob/master/CONTRIBUTING.md#style-guides) - [ ] Branch has no merge conflicts with `master` (if it does - rebase it please) - [ ] [Squashed related commits together](https://git-scm.com/book/en/Git-Tools-Rewriting-History#Squashing-Commits) ## What are the relevant issue numbers? Closes #23375 See merge request !6974
-rw-r--r--app/assets/javascripts/labels_select.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js
index f1e719937c7..b4f6e70f694 100644
--- a/app/assets/javascripts/labels_select.js
+++ b/app/assets/javascripts/labels_select.js
@@ -266,7 +266,7 @@
},
fieldName: $dropdown.data('field-name'),
id: function(label) {
- if (label.id <= 0) return;
+ if (label.id <= 0) return label.title;
if ($dropdown.hasClass('js-issuable-form-dropdown')) {
return label.id;