diff options
author | Clement Ho <clemmakesapps@gmail.com> | 2018-06-05 01:39:09 +0000 |
---|---|---|
committer | Clement Ho <clemmakesapps@gmail.com> | 2018-06-05 01:39:09 +0000 |
commit | ca13e1596852201801ed91240f47f7aa53a25938 (patch) | |
tree | a0b5b120bd87d001d970703bf0b9a933ea1ac03c | |
parent | 5a855b28374b5422fd764d3bcabbf0577a3c4571 (diff) | |
parent | 11a9389c4f6c72509c0c4aa3be6227a972adab78 (diff) | |
download | gitlab-ce-ca13e1596852201801ed91240f47f7aa53a25938.tar.gz |
Merge branch 'jivl-fix-labels-not-displayed-after-selection' into 'master'
Resolve: Labels are not displayed after selection
Closes #47250
See merge request gitlab-org/gitlab-ce!19394
-rw-r--r-- | app/assets/javascripts/labels_select.js | 2 | ||||
-rw-r--r-- | spec/javascripts/labels_select_spec.js | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/app/assets/javascripts/labels_select.js b/app/assets/javascripts/labels_select.js index eafdaf4a672..7d0ff53f366 100644 --- a/app/assets/javascripts/labels_select.js +++ b/app/assets/javascripts/labels_select.js @@ -426,7 +426,7 @@ export default class LabelsSelect { const tpl = _.template([ '<% _.each(labels, function(label){ %>', '<a href="<%- issueUpdateURL.slice(0, issueUpdateURL.lastIndexOf("/")) %>?label_name[]=<%- encodeURIComponent(label.title) %>">', - '<span class="label has-tooltip color-label" title="<%- label.description %>" style="background-color: <%- label.color %>; color: <%- label.text_color %>;">', + '<span class="badge label has-tooltip color-label" title="<%- label.description %>" style="background-color: <%- label.color %>; color: <%- label.text_color %>;">', '<%- label.title %>', '</span>', '</a>', diff --git a/spec/javascripts/labels_select_spec.js b/spec/javascripts/labels_select_spec.js index a2b89c0aef5..386e00bfd0c 100644 --- a/spec/javascripts/labels_select_spec.js +++ b/spec/javascripts/labels_select_spec.js @@ -40,5 +40,9 @@ describe('LabelsSelect', () => { it('generated label item template has correct label styles', () => { expect($labelEl.find('span.label').attr('style')).toBe(`background-color: ${label.color}; color: ${label.text_color};`); }); + + it('generated label item has a badge class', () => { + expect($labelEl.find('span').hasClass('badge')).toEqual(true); + }); }); }); |