diff options
| author | Lauri Ojansivu <x@xet7.org> | 2018-05-26 08:27:07 +0300 |
|---|---|---|
| committer | Lauri Ojansivu <x@xet7.org> | 2018-05-26 08:27:07 +0300 |
| commit | 73c4806864896559573701044c78a36ecacd9283 (patch) | |
| tree | d56310adc2e9ae8a0dd89efc093274ea0cff1e54 | |
| parent | 01741750f8de322b0e01941c0438666f95b42c47 (diff) | |
| parent | b0cf60a3d9d458ab894cc237d9ffefa18cf2fe65 (diff) | |
| download | wekan-73c4806864896559573701044c78a36ecacd9283.tar.gz wekan-73c4806864896559573701044c78a36ecacd9283.tar.bz2 wekan-73c4806864896559573701044c78a36ecacd9283.zip | |
Merge branch 'xadagaras-bugfix/received_end_date_picker' into devel
| -rw-r--r-- | CHANGELOG.md | 5 | ||||
| -rw-r--r-- | client/components/cards/cardDate.js | 5 |
2 files changed, 5 insertions, 5 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 4ef50703..4a58bd37 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,9 +7,10 @@ This release fixes the following bugs: yet](https://github.com/kelektiv/node.bcrypt.js/issues/604) and and [not yet merged pull request](https://github.com/kelektiv/node.bcrypt.js/pull/606). This may cause some slowdown; -* [Snap: Filtering out swap file created at build time, adding stage package](https://github.com/wekan/wekan/pull/1660). +* [Snap: Filtering out swap file created at build time, adding stage package](https://github.com/wekan/wekan/pull/1660); +* [Fix Received Date and End Date on Cards](https://github.com/wekan/wekan/issues/1654). -Thanks to GitHub users kubiko and xet7 for their contributions. +Thanks to GitHub users kubiko, xadagaras and xet7 for their contributions. # v1.01 2018-05-23 Wekan release diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js index f33e8c19..52a48f47 100644 --- a/client/components/cards/cardDate.js +++ b/client/components/cards/cardDate.js @@ -93,7 +93,7 @@ Template.dateBadge.helpers({ }); // editCardReceivedDatePopup -(class extends EditCardDate { +(class extends DatePicker { onCreated() { super.onCreated(); this.data().receivedAt && this.date.set(moment(this.data().receivedAt)); @@ -156,7 +156,7 @@ Template.dateBadge.helpers({ }).register('editCardDueDatePopup'); // editCardEndDatePopup -(class extends EditCardDate { +(class extends DatePicker { onCreated() { super.onCreated(); this.data().endAt && this.date.set(moment(this.data().endAt)); @@ -355,4 +355,3 @@ CardEndDate.register('cardEndDate'); return this.date.get().format('l'); } }).register('minicardEndDate'); - |