Andreas/wekan
1
0
Fork 0
mirror of https://github.com/wekan/wekan.git synced 2025-12-16 23:40:13 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Error message corrected

Browse source
This commit is contained in:
lindhork 2021-02-11 03:55:16 +01:00
parent 650519683c
commit 29c22efed0
2 changed files with 32 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

20
client/components/cards/cardDate.js
View file

@ -76,13 +76,25 @@ BlazeComponent.extendComponent({
const time = const time =
evt.target.time.value || evt.target.time.value ||
moment(new Date().setHours(12, 0, 0)).format('LT'); moment(new Date().setHours(12, 0, 0)).format('LT');
const newTime = moment(time, adjustedTimeFormat(), true);
const newDate = moment(evt.target.date.value, 'L', true);
const dateString = `${evt.target.date.value} ${time}`; const dateString = `${evt.target.date.value} ${time}`;
const newDate = moment(dateString, 'L ' + adjustedTimeFormat(), true); const newCompleteDate = moment(dateString, 'L ' + adjustedTimeFormat(), true);
if (newDate.isValid()) { if (!newTime.isValid()) {
this._storeDate(newDate.toDate()); this.error.set('invalid-time');
evt.target.time.focus();
}
if (!newDate.isValid()) {
this.error.set('invalid-date');
evt.target.date.focus();
}
if (newCompleteDate.isValid()) {
this._storeDate(newCompleteDate.toDate());
Popup.close(); Popup.close();
} else { } else {
this.error.set('invalid'); if (!this.error){
this.error.set('invalid');
}
} }
}, },
'click .js-delete-date'(evt) { 'click .js-delete-date'(evt) {

20
client/lib/datepicker.js
View file

@ -94,13 +94,25 @@ DatePicker = BlazeComponent.extendComponent({
const time = const time =
evt.target.time.value || evt.target.time.value ||
moment(new Date().setHours(12, 0, 0)).format('LT'); moment(new Date().setHours(12, 0, 0)).format('LT');
const newTime = moment(time, adjustedTimeFormat(), true);
const newDate = moment(evt.target.date.value, 'L', true);
const dateString = `${evt.target.date.value} ${time}`; const dateString = `${evt.target.date.value} ${time}`;
const newDate = moment(dateString, 'L ' + adjustedTimeFormat(), true); const newCompleteDate = moment(dateString, 'L ' + adjustedTimeFormat(), true);
if (newDate.isValid()) { if (!newTime.isValid()) {
this._storeDate(newDate.toDate()); this.error.set('invalid-time');
evt.target.time.focus();
}
if (!newDate.isValid()) {
this.error.set('invalid-date');
evt.target.date.focus();
}
if (newCompleteDate.isValid()) {
this._storeDate(newCompleteDate.toDate());
Popup.close(); Popup.close();
} else { } else {
this.error.set('invalid'); if (!this.error){
this.error.set('invalid');
}
} }
}, },
'click .js-delete-date'(evt) { 'click .js-delete-date'(evt) {