[MERGE] forward port branch 10.0 up to 34bfadb2f2

2018-01-24 15:50:56 +01:00
parent bf5c90d0be 34bfadb2f2
commit 6f2d1b8261
1 changed files with 5 additions and 1 deletions
@@ -354,7 +354,11 @@ var DateField = Field.extend(/** @lends instance.web.search.DateField# */{
        }

        // THIS SHOULD BE FORWARDPORTED UP TO SAAS-15, NOT LATER
-        var m = moment.utc(v, t === 'datetime' ? 'YYYY-MM-DD HH:mm:ss' : 'YYYY-MM-DD');
+        if (t === 'datetime') {
+            var m = moment.utc(v, 'YYYY-MM-DD HH:mm:ss');
+        } else {
+            var m = moment(v, 'YYYY-MM-DD');
+        }
        if (!m.isValid()) { return $.when(null); }
        var d = m.toDate();
        var date_string = formats.format_value(d, this.attrs);