diff options
Diffstat (limited to 'app/assets')
3 files changed, 6 insertions, 7 deletions
diff --git a/app/assets/javascripts/boards/components/issue_card_header.js b/app/assets/javascripts/boards/components/issue_card_header.js index fc06b5e6b97..60cc0be8bc0 100644 --- a/app/assets/javascripts/boards/components/issue_card_header.js +++ b/app/assets/javascripts/boards/components/issue_card_header.js @@ -1,7 +1,7 @@ export default { name: 'IssueCardHeader', props: { - confidential: { type: Boolean, required: false, default: false }, + confidential: { type: Boolean, required: true }, title: { type: String, required: true }, issueId: { type: Number, required: true }, assignee: { type: Object, required: true }, @@ -10,7 +10,7 @@ export default { }, computed: { hasAssignee() { - return Object.keys(this.assignee).length; + return Object.keys(this.assignee).length > 0; }, }, template: ` @@ -21,10 +21,7 @@ export default { <h4 class="card-title"> <a :href="issueLinkBase + '/' + issueId" :title="title">{{ title }}</a> - <span class="card-number" - v-if="issueId"> - #{{ issueId }} - </span> + <span class="card-number">#{{ issueId }}</span> </h4> <a class="card-assignee has-tooltip" :href="rootPath + assignee.username" diff --git a/app/assets/javascripts/boards/components/issue_card_inner.js b/app/assets/javascripts/boards/components/issue_card_inner.js index 370c38715e1..404a700e7ca 100644 --- a/app/assets/javascripts/boards/components/issue_card_inner.js +++ b/app/assets/javascripts/boards/components/issue_card_inner.js @@ -35,7 +35,7 @@ export default { <issue-card-labels :labels="issue.labels" :list="list" - :update-filters="true" /> + :update-filters="updateFilters" /> </div> `, }; diff --git a/app/assets/javascripts/boards/components/issue_card_labels.js b/app/assets/javascripts/boards/components/issue_card_labels.js index 1ae4a42208d..2c20c16fd4a 100644 --- a/app/assets/javascripts/boards/components/issue_card_labels.js +++ b/app/assets/javascripts/boards/components/issue_card_labels.js @@ -40,6 +40,8 @@ export default { eventHub.$emit('updateTokens'); }, labelStyle(label) { + // TODO: What happens if label.color and/or label.textColor is not defined? + return { backgroundColor: label.color, color: label.textColor, |