diff options
Diffstat (limited to 'addons/web/static/src/js/fields')
| -rw-r--r-- | addons/web/static/src/js/fields/basic_fields.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/fields/relational_fields.js | 10 | ||||
| -rw-r--r-- | addons/web/static/src/js/fields/upgrade_fields.js | 9 |
3 files changed, 13 insertions, 10 deletions
diff --git a/addons/web/static/src/js/fields/basic_fields.js b/addons/web/static/src/js/fields/basic_fields.js index 17e4e33f20e..ebe853a6a96 100644 --- a/addons/web/static/src/js/fields/basic_fields.js +++ b/addons/web/static/src/js/fields/basic_fields.js @@ -1298,9 +1298,9 @@ var FieldDomain = AbstractField.extend({ // ... then query the model to get the number of matched record if valid var self = this; return def.then(function () { - return self.rpc(self.domainModel, "search_count") + return self._rpc(self.domainModel, "search_count") .args([domain]) - .kwargs({context: self.record.getContext({fieldName: self.name})}) + .withContext(self.record.getContext({fieldName: self.name})) .exec() .then(function (data) { self._isValidForModel = true; diff --git a/addons/web/static/src/js/fields/relational_fields.js b/addons/web/static/src/js/fields/relational_fields.js index e150405e3e3..9451a43eb43 100644 --- a/addons/web/static/src/js/fields/relational_fields.js +++ b/addons/web/static/src/js/fields/relational_fields.js @@ -197,7 +197,7 @@ var FieldMany2One = AbstractField.extend({ var self = this; var slowCreate = this._searchCreatePopup.bind(this, "form", false, this._createContext(name)); if (this.nodeOptions.quick_create) { - this.rpc(this.field.relation, "name_create") + this._rpc(this.field.relation, "name_create") .args([name]) .kwargs({context: this.record.getContext({fieldName: this.name})}) .exec() @@ -267,7 +267,7 @@ var FieldMany2One = AbstractField.extend({ domain.push(['id', 'not in', blacklisted_ids]); } - this.rpc(this.field.relation, "name_search") + this._rpc(this.field.relation, "name_search") .kwargs({ name: search_val, args: domain, @@ -294,7 +294,7 @@ var FieldMany2One = AbstractField.extend({ values.push({ label: _t("Search More..."), action: function () { - self.rpc(self.field.relation, "name_search") + self._rpc(self.field.relation, "name_search") .kwargs({ name: search_val, args: domain, @@ -385,7 +385,7 @@ var FieldMany2One = AbstractField.extend({ if (this.mode === 'readonly' && !this.nodeOptions.no_open) { event.preventDefault(); event.stopPropagation(); - this.rpc(this.field.relation, 'get_formview_action') + this._rpc(this.field.relation, 'get_formview_action') .args([[this.value.res_id]]) .withContext(this.record.getContext({fieldName: this.name})) .exec() @@ -404,7 +404,7 @@ var FieldMany2One = AbstractField.extend({ } var self = this; var context = this.record.getContext({fieldName: this.name}); - this.rpc(this.field.relation, 'get_formview_id') + this._rpc(this.field.relation, 'get_formview_id') .args([[this.value.res_id]]) .withContext(context) .exec() diff --git a/addons/web/static/src/js/fields/upgrade_fields.js b/addons/web/static/src/js/fields/upgrade_fields.js index bbfd9b5b5d1..a4246983dd1 100644 --- a/addons/web/static/src/js/fields/upgrade_fields.js +++ b/addons/web/static/src/js/fields/upgrade_fields.js @@ -37,9 +37,12 @@ var AbstractFieldUpgrade = { */ _confirmUpgrade: function () { var args = [[["share", "=", false]]]; - return this.performModelRPC('res.users', 'search_count', args).then(function (data) { - framework.redirect("https://www.odoo.com/odoo-enterprise/upgrade?num_users=" + data); - }); + return this._rpc('res.users', 'search_count') + .args(args) + .exec() + .then(function (data) { + framework.redirect("https://www.odoo.com/odoo-enterprise/upgrade?num_users=" + data); + }); }, /** * This function is meant to be overriden to insert the 'Enterprise' label |