odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[IMP]remove callback from name_search and improve related code. 

bzr revid: vme@tinyerp.com-20120928071542-dlt7sq8ayb2hqs8e
This commit is contained in:
Vidhin Mehta (OpenERP) 2012-09-28 12:45:42 +05:30
parent 6d692fac36
commit 3b6d9b8cbc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/web/static/src/js/data.js
View File

@ -733,14 +733,14 @@ instance.web.DataSet = instance.web.CallbackEnabled.extend({
* @param {Function} callback function to call with name_search result
* @returns {$.Deferred}
*/
name_search: function (name, domain, operator, limit, callback) {
name_search: function (name, domain, operator, limit) {
return this._model.call('name_search', {
name: name || '',
args: domain || false,
operator: operator || 'ilike',
context: this._model.context(),
limit: limit || 0
}).then(callback);
});
},
/**
* @param name

4
addons/web/static/src/js/view_form.js
View File

@ -2659,7 +2659,7 @@ instance.web.form.CompletionFieldMixin = {
return this.orderer.add(dataset.name_search(
search_val, new instance.web.CompoundDomain(self.build_domain(), [["id", "not in", blacklist]]),
'ilike', this.limit + 1, self.build_context())).pipe(function(data) {
'ilike', this.limit + 1)).then(self.trigger('build_context')).pipe(function(data) {
self.last_search = data;
// possible selections for the m2o
var values = _.map(data, function(x) {
@ -2678,7 +2678,7 @@ instance.web.form.CompletionFieldMixin = {
values.push({
label: _t("Search More..."),
action: function() {
dataset.name_search(search_val, self.build_domain(), 'ilike', false, function(data) {
dataset.name_search(search_val, self.build_domain(), 'ilike', false).then(function(data) {
self._search_create_popup("search", data);
});
},