From b87ee9e3c900a491bd486f355807ff801cf1e016 Mon Sep 17 00:00:00 2001 From: Jane Sandberg Date: Sun, 7 Apr 2019 09:21:51 -0700 Subject: [PATCH] LP1816475: making datetime-select in fmeditor more consistent with date-select Signed-off-by: Jane Sandberg --- Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html | 1 + Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts | 2 -- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html index b758fd4b73..7d0bb2d17b 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.html @@ -51,6 +51,7 @@ [timezone]="timezone" domId="{{idPrefix}}-{{field.name}}" (onChangeAsMoment)="field.validate(field.name, $event, record)" + (onChangeAsIso)="record[field.name]($event)" [validatorError]="field.validatorError" i18n-validatorError [readOnly]="field.readOnly" diff --git a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts index d955424c40..d36d56f368 100644 --- a/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts +++ b/Open-ILS/src/eg2/src/app/share/fm-editor/fm-editor.component.ts @@ -276,8 +276,6 @@ export class FmRecordEditorComponent } else { // TODO: some bools can be NULL rec[field.name]('f'); } - } else if ( field.datatype === 'timestamp' && field.datetime && rec[field.name]() ) { - rec[field.name] = this.format.idlFormatDatetime(rec[field.name](), this.timezone); } else if (field.datatype === 'org_unit') { const org = rec[field.name](); if (org && typeof org === 'object') { -- 2.11.0