diff options
| author | Géry Debongnie <ged@odoo.com> | 2017-03-05 09:34:56 +0100 |
|---|---|---|
| committer | Aaron Bohy <aab@odoo.com> | 2017-04-11 19:44:38 +0200 |
| commit | e5740270568404d71a3bc093074a085c9c2eded8 (patch) | |
| tree | 7b84740d92c550236de25a37cf37d244760bdbf3 /addons/web/static/src/js/fields | |
| parent | 0df9968433389e0d504276cd711473c2eef937ae (diff) | |
[REF] web,*: remove 'web.model' and 'web.dataModel
Use this.rpc instead of Model object, with web.ajax if necessary.
nb: EventDispatcherMixin include now the custom_events managment instead
of widget
Diffstat (limited to 'addons/web/static/src/js/fields')
| -rw-r--r-- | addons/web/static/src/js/fields/basic_fields.js | 16 | ||||
| -rw-r--r-- | addons/web/static/src/js/fields/relational_fields.js | 10 |
2 files changed, 12 insertions, 14 deletions
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index 76275a11d3e..6b2cd4d6754 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -1299,19 +1299,17 @@ var FieldDomain = AbstractField.extend({ var self = this; return def.then(function () { var context = {}; // FIXME ? - return self.performModelRPC(self.domainModel, "search_count", [ - domain, - context - ]).then( - function (data) { + return self.rpc(self.domainModel, "search_count") + .args([domain,context]) + .exec() + .then(function (data) { self._isValidForModel = true; return data; - }, - function (error, e) { + }, function (error, e) { e.preventDefault(); self._isValidForModel = false; - } - ).always(self._replaceContent.bind(self)); + }) + .always(self._replaceContent.bind(self)); }); }, /** diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index b3b3a26c437..c5750c86735 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -227,14 +227,14 @@ var FieldMany2One = AbstractRelationalField.extend({ var self = this; var slowCreate = this._searchCreatePopup.bind(this, "form", false, this._createContext(name)); if (this.nodeOptions.quick_create) { - this.performModelRPC(this.field.relation, "name_create", [name]).then( - function (result) { + this.rpc(this.field.relation, "name_create") + .args([name]) + .exec() + .then(function (result) { if (self.mode === "edit") { self.reinitialize({id: result[0], display_name: result[1]}); } - }, - slowCreate - ); + }, slowCreate); } else { slowCreate(); } |
