summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrea Grazioso (agr-odoo) <agr@odoo.com>2019-10-23 13:15:25 +0000
committerfw-bot <otis@odoo.com>2019-11-18 07:58:38 +0000
commit9daed92a6d3353a3d5f549aee16aa62fa0457d63 (patch)
tree6efffa1203c10bb6f8e237e684f94c11b732df49
parent91f503cd99dfa6fc6562afc1b627b6f8b0f1d91b (diff)
[FIX] web: translate popup broken
Install accounting and activate a new language. Under Accounting>Settings>Terms and Conditions input something, save and then click on the near lanuage button. A popup will appear with only the possibility to close and save but with no text. This is because no row is fetched from the ir.translation table, because the domain for the search is ``` ['&', ['res_id', '=', None], ['name', '=like', 'res.config.settings,%'], ['name', '=', 'undefined'] ] ``` * wrong res.id "None" instead of the correct one (1) * wrong name pointing to somewhat related to 'res.config.settings' (the field name is "res.company,invoice_terms") * another wrong condition on name equal "undefined" The domain is malformed because in addons/web/static/src/js/views/basic/basic_controller.js record.res_id is unset while record.res_ids is it. Rewriting res_id to make sure the id is there fix the issue Thanks to mart-e opw-2091779 closes odoo/odoo#40394 X-original-commit: 20e84558de476c17fed73f7ea5a11989401bffaf Signed-off-by: Nicolas Martinelli (nim) <nim@odoo.com>
-rw-r--r--addons/web/static/src/js/views/basic/basic_controller.js3
1 files changed, 2 insertions, 1 deletions
diff --git a/addons/web/static/src/js/views/basic/basic_controller.js b/addons/web/static/src/js/views/basic/basic_controller.js
index 7639d2dea99..ddc1795cb14 100644
--- a/addons/web/static/src/js/views/basic/basic_controller.js
+++ b/addons/web/static/src/js/views/basic/basic_controller.js
@@ -823,12 +823,13 @@ var BasicController = AbstractController.extend(FieldManagerMixin, {
await this._confirmChange(ev.data.id, updatedFields, ev);
}
var record = this.model.get(ev.data.id, { raw: true });
+ var res_id = record.res_id || record.res_ids[0];
var result = await this._rpc({
route: '/web/dataset/call_button',
params: {
model: 'ir.translation',
method: 'translate_fields',
- args: [record.model, record.res_id, ev.data.fieldName],
+ args: [record.model, res_id, ev.data.fieldName],
kwargs: { context: record.getContext() },
}
});