pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: date autocompletion should not harcode 'date'

Browse Source 
But should use date or datetime according to the widget type

This fix is related to 69d60465ee
This commit is contained in:
Denis Ledoux
2014-11-14 17:57:10 +01:00
parent 0a7633c11e
commit 922a52dcde
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/search.js
+10 -2
View File
@@ -1497,10 +1497,18 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst
return instance.web.date_to_str(facetValue.get('value')); return instance.web.date_to_str(facetValue.get('value'));
}, },
complete: function (needle) { complete: function (needle) {
var d;
try { 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) { } catch (e) {
return false; // pass
} }
if (!d) { return $.when(null); } if (!d) { return $.when(null); }
var date_string = instance.web.format_value(d, this.attrs); var date_string = instance.web.format_value(d, this.attrs);