summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2018-05-26 07:49:49 +0300
committerLauri Ojansivu <x@xet7.org>2018-05-26 07:49:49 +0300
commit3ca3d063a7564973de64493a74d1fef0a0f6971c (patch)
tree4cedd24a76d57f6e9f5e8bf507a3aac03aa9f29a
parent01741750f8de322b0e01941c0438666f95b42c47 (diff)
parentbe507e567a48c0cefef5a472fc73ce0d2dafa82c (diff)
downloadwekan-3ca3d063a7564973de64493a74d1fef0a0f6971c.tar.gz
wekan-3ca3d063a7564973de64493a74d1fef0a0f6971c.tar.bz2
wekan-3ca3d063a7564973de64493a74d1fef0a0f6971c.zip
Merge branch 'bugfix/received_end_date_picker' of https://github.com/xadagaras/wekan into xadagaras-bugfix/received_end_date_picker
-rw-r--r--client/components/cards/cardDate.js5
1 files 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');
-