diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-09-28 12:45:42 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-09-28 12:45:42 +0530 |
| commit | 3b6d9b8cbca0d4e3b52ba9028202e0d195120c6a (patch) | |
| tree | 652c97f23c54de4a735b91286c903f58d28861f0 /addons/web/static/src | |
| parent | 6d692fac366553a729ab0314e185439df3a9ecab (diff) | |
[IMP]remove callback from name_search and improve related code.
bzr revid: vme@tinyerp.com-20120928071542-dlt7sq8ayb2hqs8e
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/data.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index 55bc9239536..4c4097868f8 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -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 diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c888c13e6be..dd3c2dac554 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -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); }); }, |