diff options
| author | Denis Ledoux <dle@odoo.com> | 2014-11-14 18:02:02 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2014-11-14 18:02:02 +0100 |
| commit | c7d8e9726b77978b271cb026abcf31571e4a6756 (patch) | |
| tree | 535ae116e45e9e4a1b25778b1311a712f5ee3559 /addons/web/static/src/js | |
| parent | d9e48bae42f84d0880ac1be66c31c50be08d9417 (diff) | |
| parent | c5714135c20e671990fbe4564884ebddacbe0206 (diff) | |
[MERGE] forward port of branch saas-3 up to c571413
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/search.js | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 07982cb07f7..9b155054774 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -1572,10 +1572,18 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst return instance.web.date_to_str(facetValue.get('value')); }, complete: function (needle) { + var d; try { - var d = instance.web.str_to_date(instance.web.parse_value(needle, {'widget': 'date'})); + var t = (this.attrs && this.attrs.type === 'datetime') ? 'datetime' : 'date'; + var v = instance.web.parse_value(needle, {'widget': t}); + if (t === 'datetime'){ + d = instance.web.str_to_datetime(v); + } + else{ + d = instance.web.str_to_date(v); + } } catch (e) { - return false; + // pass } if (!d) { return $.when(null); } var date_string = instance.web.format_value(d, this.attrs); |
