ENGCOM-4148: Fixed #17564 Magento 2 inline edit date issues in admin …

…grid with Ui Component #20902
magento · Feb 14, 2019 · 267d4d8 · 267d4d8
2 parents 29747d3 + 0abf5d8
commit 267d4d8
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/date.js b/app/code/Magento/Ui/view/base/web/js/form/element/date.js
@@ -122,10 +122,12 @@ define([
                     shiftedValue = moment.tz(value, 'UTC').tz(this.storeTimeZone);
                 } else {
                     dateFormat = this.shiftedValue() ? this.outputDateFormat : this.inputDateFormat;
-
                     shiftedValue = moment(value, dateFormat);
                 }
 
+                if (!shiftedValue.isValid()) {
+                    shiftedValue = moment(value, this.inputDateFormat);
+                }
                 shiftedValue = shiftedValue.format(this.pickerDateTimeFormat);
             } else {
                 shiftedValue = '';