summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-10-29 19:12:35 +0200
committerGitHub <noreply@github.com>2019-10-29 19:12:35 +0200
commit6fc9dd13239318dcbd02f91445e177ba73d82445 (patch)
tree643a851e7bdcf5448006a065252edf9decf38eb0
parent7d6d3af54a2fc1fb68634725eb754b22f02fd430 (diff)
parent064c4d7ca7cce65989979480a5f6ff4816895283 (diff)
downloadwekan-6fc9dd13239318dcbd02f91445e177ba73d82445.tar.gz
wekan-6fc9dd13239318dcbd02f91445e177ba73d82445.tar.bz2
wekan-6fc9dd13239318dcbd02f91445e177ba73d82445.zip
Merge pull request #2763 from liske/changes/sensible-card-times
Enhancement: set card times more sensible using the 'Today' button in…
-rw-r--r--client/components/cards/cardDate.js8
-rw-r--r--client/lib/datepicker.js5
2 files changed, 7 insertions, 6 deletions
diff --git a/client/components/cards/cardDate.js b/client/components/cards/cardDate.js
index 91205f1c..6634ee1b 100644
--- a/client/components/cards/cardDate.js
+++ b/client/components/cards/cardDate.js
@@ -105,7 +105,7 @@ Template.dateBadge.helpers({
// editCardReceivedDatePopup
(class extends DatePicker {
onCreated() {
- super.onCreated();
+ super.onCreated(moment().format('YYYY-MM-DD HH:mm'));
this.data().getReceived() &&
this.date.set(moment(this.data().getReceived()));
}
@@ -122,7 +122,7 @@ Template.dateBadge.helpers({
// editCardStartDatePopup
(class extends DatePicker {
onCreated() {
- super.onCreated();
+ super.onCreated(moment().format('YYYY-MM-DD HH:mm'));
this.data().getStart() && this.date.set(moment(this.data().getStart()));
}
@@ -148,7 +148,7 @@ Template.dateBadge.helpers({
// editCardDueDatePopup
(class extends DatePicker {
onCreated() {
- super.onCreated();
+ super.onCreated('1970-01-01 17:00:00');
this.data().getDue() && this.date.set(moment(this.data().getDue()));
}
@@ -171,7 +171,7 @@ Template.dateBadge.helpers({
// editCardEndDatePopup
(class extends DatePicker {
onCreated() {
- super.onCreated();
+ super.onCreated(moment().format('YYYY-MM-DD HH:mm'));
this.data().getEnd() && this.date.set(moment(this.data().getEnd()));
}
diff --git a/client/lib/datepicker.js b/client/lib/datepicker.js
index da44bbc5..8ad66c5f 100644
--- a/client/lib/datepicker.js
+++ b/client/lib/datepicker.js
@@ -3,10 +3,11 @@ DatePicker = BlazeComponent.extendComponent({
return 'datepicker';
},
- onCreated() {
+ onCreated(defaultTime = '1970-01-01 08:00:00') {
this.error = new ReactiveVar('');
this.card = this.data();
this.date = new ReactiveVar(moment.invalid());
+ this.defaultTime = defaultTime;
},
onRendered() {
@@ -26,7 +27,7 @@ DatePicker = BlazeComponent.extendComponent({
if (!timeInput.value) {
const currentHour = evt.date.getHours();
const defaultMoment = moment(
- currentHour > 0 ? evt.date : '1970-01-01 08:00:00',
+ currentHour > 0 ? evt.date : this.defaultTime,
); // default to 8:00 am local time
timeInput.value = defaultMoment.format('LT');
}