From be507e567a48c0cefef5a472fc73ce0d2dafa82c Mon Sep 17 00:00:00 2001 From: Daniel Kreuter Date: Fri, 25 May 2018 19:44:49 +0200 Subject: Extend editCardReceivedDatePopup and editCardEndDatePopup from DatePicker to fix #1654 --- client/components/cards/cardDate.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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'); - -- cgit v1.2.3-1-g7c22 From b0cf60a3d9d458ab894cc237d9ffefa18cf2fe65 Mon Sep 17 00:00:00 2001 From: Lauri Ojansivu Date: Sat, 26 May 2018 07:52:20 +0300 Subject: - Fix Received Date and End Date on Cards. Thanks to xadagaras ! --- CHANGELOG.md | 5 +++-- 1 file changed, 3 insertions(+), 2 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 -- cgit v1.2.3-1-g7c22