diff options
| -rw-r--r-- | client/components/cards/cardDate.js | 22 | ||||
| -rw-r--r-- | client/components/cards/cardDetails.jade | 7 | ||||
| -rw-r--r-- | client/components/cards/subtasks.js | 1 | ||||
| -rw-r--r-- | server/migrations.js | 1 |
4 files changed, 6 insertions, 25 deletions
diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js index aa0dca4c..e38143d5 100644 --- a/client/components/cards/cardDate.js +++ b/client/components/cards/cardDate.js @@ -256,9 +256,8 @@ class CardStartDate extends CardDate { classes() { let classes = 'start-date' + ' '; -<<<<<<< HEAD - const dueAt = this.data().dueAt; - const endAt = this.data().endAt; + const dueAt = this.data().getDue(); + const endAt = this.data().getEnd(); const theDate = this.date.get(); const now = this.now.get(); // if dueAt or endAt exist & are > startAt, startAt doesn't need to be flagged @@ -268,10 +267,6 @@ class CardStartDate extends CardDate { else if (theDate.isBefore(now, 'minute')) classes += 'almost-due'; else -======= - if (this.date.get().isBefore(this.now.get(), 'minute') && - this.now.get().isBefore(this.data().getDue())) { ->>>>>>> Add two way binding of card/board times classes += 'current'; return classes; } @@ -299,8 +294,7 @@ class CardDueDate extends CardDate { classes() { let classes = 'due-date' + ' '; - - const endAt = this.data().endAt; + const endAt = this.data().getEnd(); const theDate = this.date.get(); const now = this.now.get(); // if the due date is after the end date, green - done early @@ -341,22 +335,14 @@ class CardEndDate extends CardDate { classes() { let classes = 'end-date' + ' '; -<<<<<<< HEAD - const dueAt = this.data.dueAt; + const dueAt = this.data().getDue(); const theDate = this.date.get(); - // if dueAt exists & is after endAt, endAt doesn't need to be flagged - if ((dueAt) && (theDate.isAfter(dueAt, 'minute'))) - classes += 'long-overdue'; - else - classes += 'current'; -======= if (this.date.get().diff(this.data().getDue(), 'days') >= 2) classes += 'long-overdue'; else if (this.date.get().diff(this.data().getDue(), 'days') >= 0) classes += 'due'; else if (this.date.get().diff(this.data().getDue(), 'days') >= -2) classes += 'almost-due'; ->>>>>>> Add two way binding of card/board times return classes; } diff --git a/client/components/cards/cardDetails.jade b/client/components/cards/cardDetails.jade index 98fba692..4401d24b 100644 --- a/client/components/cards/cardDetails.jade +++ b/client/components/cards/cardDetails.jade @@ -59,13 +59,6 @@ template(name="cardDetails") else a.js-end-date {{_ 'add'}} - .card-details-item.card-details-item-due - h3.card-details-item-title {{_ 'card-due'}} - if dueAt - +cardDueDate - else - a.js-due-date {{_ 'add'}} - .card-details-items .card-details-item.card-details-item-members h3.card-details-item-title {{_ 'members'}} diff --git a/client/components/cards/subtasks.js b/client/components/cards/subtasks.js index 9c6f265e..1651d449 100644 --- a/client/components/cards/subtasks.js +++ b/client/components/cards/subtasks.js @@ -29,6 +29,7 @@ BlazeComponent.extendComponent({ boardId: targetBoard._id, sort: sortIndex, swimlaneId, + type: 'cardType-card', }); // In case the filter is active we need to add the newly inserted card in diff --git a/server/migrations.js b/server/migrations.js index 16fe225e..91c34be2 100644 --- a/server/migrations.js +++ b/server/migrations.js @@ -223,6 +223,7 @@ Migrations.add('add-card-types', () => { noValidate ); }); +}); Migrations.add('add-custom-fields-to-cards', () => { Cards.update({ |