inteligr8/alfresco-ng2-components
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-ng2-components.git synced 2025-05-26 17:24:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix datewidget's moment issue (#2384)

Browse Source
This commit is contained in:
Popovics András 2017-09-27 20:22:42 +01:00 committed by Eugenio Romano
parent 2651f17a14
commit 9af78dc240
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.spec.ts
View File

@ -114,7 +114,7 @@ describe('DateWidgetComponent', () => {
widget.field = field; widget.field = field;
widget.onDateChanged('12/12/2012'); widget.onDateChanged({ value: moment('12/12/2012') });
expect(widget.checkVisibility).toHaveBeenCalledWith(field); expect(widget.checkVisibility).toHaveBeenCalledWith(field);
}); });

8
ng2-components/ng2-activiti-form/src/components/widgets/date/date.widget.ts
View File

@ -60,7 +60,7 @@ export class DateWidgetComponent extends WidgetComponent implements OnInit {
} }
} }
this.displayDate = moment(this.field.value, this.field.dateDisplayFormat, true); this.displayDate = moment(this.field.value, this.field.dateDisplayFormat);
} }
@ -68,13 +68,13 @@ export class DateWidgetComponent extends WidgetComponent implements OnInit {
this.field.validationSummary = ''; this.field.validationSummary = '';
if (newDateValue) { if (newDateValue) {
let momentDate = moment(newDateValue, this.field.dateDisplayFormat, true); let momentDate = newDateValue.value;
if (!momentDate.isValid()) { if (!momentDate.isValid()) {
this.field.validationSummary = this.field.dateDisplayFormat; this.field.validationSummary = this.field.dateDisplayFormat;
this.field.value = null; this.field.value = null;
} else { } else {
this.field.value = newDateValue; this.field.value = momentDate;
this.displayDate = moment(this.field.value, this.field.dateDisplayFormat, true); this.displayDate = moment(this.field.value, this.field.dateDisplayFormat);
} }
} else { } else {
this.field.value = null; this.field.value = null;