diff options
| author | Antony Lesuisse <al@openerp.com> | 2012-09-30 16:58:36 +0200 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2012-09-30 16:58:36 +0200 |
| commit | 5278efece4ecf45cffae704b9d9223c567e33604 (patch) | |
| tree | 5667f9b162ec2be6d78e9d1f983185063865b7ae /addons/web/static/src/js | |
| parent | b634ca91a0c9cd08f35175511912f6d72b52804e (diff) | |
| parent | 3b6d9b8cbca0d4e3b52ba9028202e0d195120c6a (diff) | |
[MERGE] callback2deferred dataset.name_search
bzr revid: al@openerp.com-20120930145836-uavy0c4ghxlmxvcc
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/data.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/addons/web/static/src/js/data.js b/addons/web/static/src/js/data.js index c9d5dbe48ff..a26664f2203 100644 --- a/addons/web/static/src/js/data.js +++ b/addons/web/static/src/js/data.js @@ -732,14 +732,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 c98c6ffe373..e3d227c2e3c 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2714,7 +2714,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); }); }, |