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

[TESTS] completion call on various widgets, fixed corresponding implementations

Browse Source 
bzr revid: xmo@openerp.com-20120427080607-1bw1jpmu7h6zxdin
This commit is contained in:
Xavier Morel
2012-04-27 10:06:07 +02:00
parent 19e771dd9f
commit 8f5a591ab0
2 changed files with 167 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/search.js
+27 -17
View File
@@ -1076,9 +1076,12 @@ instance.web.search.CharField = instance.web.search.Field.extend( /** @lends ins
field: '<em>' + this.attrs.string + '</em>',
value: '<strong>' + _.str.escapeHTML(value) + '</strong>'});
return $.when([{
category: this.attrs.string,
label: label,
value: [{label: label, value: value}]
facet: {
category: this.attrs.string,
field: this,
values: [{label: value, value: value}]
}
}]);
}
});
@@ -1158,16 +1161,18 @@ instance.web.search.SelectionField = instance.web.search.Field.extend(/** @lends
return label.toLowerCase().indexOf(needle.toLowerCase()) !== -1;
})
.map(function (sel) {
// FIXME fucking repetition man, find something better
return {
category: self.attrs.string,
value: sel[1],
values: [{value: sel[0], label: sel[1]}]
label: sel[1],
facet: {
category: self.attrs.string,
field: self,
values: [{value: sel[0], label: sel[1]}]
}
};
}).value();
if (_.isEmpty(results)) { return $.when(null); }
return $.when.apply(null, [{
category: this.attrs.string
return $.when.call(null, [{
label: this.attrs.string
}].concat(results));
},
facet_for: function (value) {
@@ -1216,16 +1221,18 @@ instance.web.search.DateField = instance.web.search.Field.extend(/** @lends inst
complete: function (needle) {
var d = Date.parse(needle);
if (!d) { return $.when(null); }
var value = instance.web.format_value(d, this.attrs);
var date_string = instance.web.format_value(d, this.attrs);
var label = _.str.sprintf(_.str.escapeHTML(
_t("Search %(field)s at: %(value)s")), {
field: '<em>' + this.attrs.string + '</em>',
value: '<strong>' + value + '</strong>'});
value: '<strong>' + date_string + '</strong>'});
return $.when([{
category: this.attrs.string,
label: label,
// FIXME: brain broken
values: [{label: value, value: d}]
facet: {
category: this.attrs.string,
field: this,
values: [{label: date_string, value: d}]
}
}]);
}
});
@@ -1260,12 +1267,15 @@ instance.web.search.ManyToOneField = instance.web.search.CharField.extend({
context: {}
}).pipe(function (results) {
if (_.isEmpty(results)) { return null; }
return [{category: self.attrs.string}].concat(
return [{label: self.attrs.string}].concat(
_(results).map(function (result) {
return {
category: self.attrs.string,
value: result[1],
values: [{label: result[1], value: result[0]}]
label: result[1],
facet: {
category: self.attrs.string,
field: self,
values: [{label: result[1], value: result[0]}]
}
};
}));
});