Commit 17c1b20f authored by Clement Ho's avatar Clement Ho

Merge branch '55980-remove-add-issue-on-blank-list' into 'master'

Remove non-functional add issue button on welcome list

Closes #55980

See merge request gitlab-org/gitlab-ce!26742
parents 5570ce7d 2378dde2
...@@ -54,7 +54,10 @@ export default Vue.extend({ ...@@ -54,7 +54,10 @@ export default Vue.extend({
return `${n__('%d issue', '%d issues', issuesSize)}`; return `${n__('%d issue', '%d issues', issuesSize)}`;
}, },
isNewIssueShown() { isNewIssueShown() {
return this.list.type === 'backlog' || (!this.disabled && this.list.type !== 'closed'); return (
this.list.type === 'backlog' ||
(!this.disabled && this.list.type !== 'closed' && this.list.type !== 'blank')
);
}, },
}, },
watch: { watch: {
......
...@@ -234,7 +234,7 @@ ...@@ -234,7 +234,7 @@
} }
.board-title-text { .board-title-text {
margin-right: auto; margin: $gl-vert-padding auto $gl-vert-padding 0;
} }
.board-delete { .board-delete {
......
---
title: Remove non-functional add issue button on welcome list
merge_request: !26742
author:
type: fixed
...@@ -103,4 +103,18 @@ describe('Board component', () => { ...@@ -103,4 +103,18 @@ describe('Board component', () => {
}) })
.catch(done.fail); .catch(done.fail);
}); });
it('does render add issue button', () => {
expect(vm.$el.querySelector('.issue-count-badge-add-button')).not.toBeNull();
});
it('does not render add issue button when list type is blank', done => {
vm.list.type = 'blank';
Vue.nextTick(() => {
expect(vm.$el.querySelector('.issue-count-badge-add-button')).toBeNull();
done();
});
});
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment