From 703263ad451ad67ea4b856c0a9912c08a6513fa7 Mon Sep 17 00:00:00 2001 From: "Lucas Perais (lpe)" Date: Tue, 5 Feb 2019 12:53:46 +0000 Subject: [PATCH] [FIX] mail: activity model js: pass context to get activity data Go on the crm activity view Have your user operate in another language than en_US Bafore this commit, the activity types were not translated This was because the context was not passed to the function After this commit, the terms are translated OPW 1924232 closes odoo/odoo#30837 --- addons/mail/static/src/js/views/activity/activity_model.js | 2 ++ addons/mail/static/tests/activity_tests.js | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/mail/static/src/js/views/activity/activity_model.js b/addons/mail/static/src/js/views/activity/activity_model.js index 146609bbb52..738cdb55ca1 100644 --- a/addons/mail/static/src/js/views/activity/activity_model.js +++ b/addons/mail/static/src/js/views/activity/activity_model.js @@ -2,6 +2,7 @@ odoo.define('mail.ActivityModel', function (require) { 'use strict'; var AbstractModel = require('web.AbstractModel'); +var session = require('web.session'); var ActivityModel = AbstractModel.extend({ //-------------------------------------------------------------------------- @@ -57,6 +58,7 @@ var ActivityModel = AbstractModel.extend({ kwargs: { res_model: this.modelName, domain: this.domain, + context: session.user_context, } }).then(function (result) { self.data.data = result; diff --git a/addons/mail/static/tests/activity_tests.js b/addons/mail/static/tests/activity_tests.js index 9f7f7fd8808..88ec9948f4f 100644 --- a/addons/mail/static/tests/activity_tests.js +++ b/addons/mail/static/tests/activity_tests.js @@ -338,7 +338,7 @@ QUnit.test('activity view: activity widget', function (assert) { activity.destroy(); }); QUnit.test('activity view: no group by', function (assert) { - assert.expect(4); + assert.expect(5); var actionManager = createActionManager({ actions: [{ @@ -353,8 +353,13 @@ QUnit.test('activity view: no group by', function (assert) { 'task,false,search': '', }, data: this.data, + session: { + user_context: {lang: 'zz_ZZ'}, + }, mockRPC: function(route, args) { if (args.method === 'get_activity_data') { + assert.deepEqual(args.kwargs.context, {lang: 'zz_ZZ'}, + 'The context should have been passed'); return $.when(ACTIVITY_DATA); } return this._super(route, args);