diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 0815191c0..041bf6256 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -73,8 +73,10 @@ template(name="cardDetails") a.card-label.add-label.js-add-labels(title="{{_ 'card-labels-title'}}") i.fa.fa-plus - if currentBoard.allowsReceivedDate + if currentBoard.hasAnyAllowsDate hr + + if currentBoard.allowsReceivedDate .card-details-item.card-details-item-received h3.card-details-item-title i.fa.fa-sign-out @@ -126,7 +128,9 @@ template(name="cardDetails") a.card-label.add-label.js-end-date i.fa.fa-plus - hr + if currentBoard.hasAnyAllowsUser + hr + if currentBoard.allowsCreator .card-details-item.card-details-item-creator h3.card-details-item-title @@ -167,17 +171,6 @@ template(name="cardDetails") a.assignee.add-assignee.card-details-item-add-button.js-add-assignees(title="{{_ 'assignee'}}") i.fa.fa-plus - //.card-details-items - if getSpentTime - .card-details-item.card-details-item-spent - if getIsOvertime - h3.card-details-item-title - | {{_ 'overtime-hours'}} - else - h3.card-details-item-title - | {{_ 'spent-time-hours'}} - +cardSpentTime - //.card-details-items if currentBoard.allowsRequestedBy .card-details-item.card-details-item-name @@ -219,6 +212,9 @@ template(name="cardDetails") +viewer = getAssignedBy + if $or currentBoard.allowsCardSortingByNumber getSpentTime + hr + if currentBoard.allowsCardSortingByNumber .card-details-item.card-details-sort-order h3.card-details-item-title @@ -232,6 +228,17 @@ template(name="cardDetails") +viewer = sort + //.card-details-items + if getSpentTime + .card-details-item.card-details-item-spent + if getIsOvertime + h3.card-details-item-title + | {{_ 'overtime-hours'}} + else + h3.card-details-item-title + | {{_ 'spent-time-hours'}} + +cardSpentTime + //.card-details-items if customFieldsWD .material-toggle-switch(title="{{_ 'change'}} {{_ 'custom-fields'}} {{_ 'layout'}}") diff --git a/models/boards.js b/models/boards.js index f74d79f75..de2a87746 100644 --- a/models/boards.js +++ b/models/boards.js @@ -865,6 +865,16 @@ Boards.helpers({ }); }, + hasAnyAllowsDate() { + const ret = this.allowsReceivedDate || this.allowsStartDate || this.allowsDueDate || this.allowsEndDate; + return ret; + }, + + hasAnyAllowsUser() { + const ret = this.allowsCreator || this.allowsMembers || this.allowsAssignee || this.allowsRequestedBy || this.allowsAssignedBy; + return ret; + }, + absoluteUrl() { return FlowRouter.url('board', { id: this._id, slug: this.slug }); },