summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-08-18 10:57:02 +0100
committerPhil Hughes <me@iamphill.com>2017-08-18 10:57:02 +0100
commitad46dcca405f4f56e441f4377b318e3bff4072cd (patch)
tree4984df6481a87ba2248dd87cec76ad18b5c57110
parent6ed01ebf9198a0652ad7e0825415706745c74b2c (diff)
downloadgitlab-ce-issue-boards-closed-shows-empty-label.tar.gz
Fixed issue boards closed list displaying empty labelissue-boards-closed-shows-empty-label
Closes #36650
-rw-r--r--app/assets/javascripts/boards/components/issue_card_inner.js2
-rw-r--r--spec/javascripts/boards/issue_card_spec.js19
2 files changed, 20 insertions, 1 deletions
diff --git a/app/assets/javascripts/boards/components/issue_card_inner.js b/app/assets/javascripts/boards/components/issue_card_inner.js
index d3de1830895..9a5d87ede7e 100644
--- a/app/assets/javascripts/boards/components/issue_card_inner.js
+++ b/app/assets/javascripts/boards/components/issue_card_inner.js
@@ -97,7 +97,7 @@ gl.issueBoards.IssueCardInner = Vue.extend({
return `Avatar for ${assignee.name}`;
},
showLabel(label) {
- if (!this.list || !label) return true;
+ if (!label.id) return false;
return true;
},
filterByLabel(label, e) {
diff --git a/spec/javascripts/boards/issue_card_spec.js b/spec/javascripts/boards/issue_card_spec.js
index 69cfcbbce5a..47aaa57e6b9 100644
--- a/spec/javascripts/boards/issue_card_spec.js
+++ b/spec/javascripts/boards/issue_card_spec.js
@@ -278,6 +278,25 @@ describe('Issue card component', () => {
nodes.includes(label1.color),
).toBe(true);
});
+
+ it('does not render label if label does not have an ID', (done) => {
+ component.issue.addLabel(new ListLabel({
+ title: 'closed',
+ }));
+
+ Vue.nextTick()
+ .then(() => {
+ expect(
+ component.$el.querySelectorAll('.label').length,
+ ).toBe(2);
+ expect(
+ component.$el.textContent,
+ ).not.toContain('closed');
+
+ done();
+ })
+ .catch(done.fail);
+ });
});
});
});