[MERGE] forward port branch saas-11.3 up to 0de06a41326

1 files changed, 14 insertions, 7 deletions

diff --git a/addons/board/static/src/js/board_view.js b/addons/board/static/src/js/board_view.js
index b2d57903a3d..60abe892045 100644
--- a/addons/board/static/src/js/board_view.js
+++ b/addons/board/static/src/js/board_view.js
@@ -9,6 +9,8 @@ var Domain = require('web.Domain');
 var FormController = require('web.FormController');
 var FormRenderer = require('web.FormRenderer');
 var FormView = require('web.FormView');
+var pyUtils = require('web.pyeval'); // do not forwardport this to 12.0
+var session  = require('web.session');
 var viewRegistry = require('web.view_registry');
 
 var _t = core._t;
@@ -236,7 +238,6 @@ var BoardRenderer = FormRenderer.extend({
      */
     _createController: function (params) {
         var self = this;
-        var context = params.context.eval();
         return this._rpc({
                 route: '/web/action/load',
                 params: {action_id: params.actionID}
@@ -246,18 +247,24 @@ var BoardRenderer = FormRenderer.extend({
                     // the action does not exist anymore
                     return $.when();
                 }
+                // tz and lang are saved in the custom view
+                // override the language to take the current one
+                var rawContext = new Context(params.context, action.context, {lang: session.user_context.lang});
+                var context = pyUtils.eval('context', rawContext);
+                var domain = params.domain || pyUtils.eval('domain', action.domain || '[]', action.context);
+                var viewType = params.viewType || action.views[0][1];
                 var view = _.find(action.views, function (descr) {
-                    return descr[1] === params.viewType;
-                }) || [false, params.viewType];
+                    return descr[1] === viewType;
+                }) || [false, viewType];
                 return self.loadViews(action.res_model, context, [view])
                            .then(function (viewsInfo) {
-                    var viewInfo = viewsInfo[params.viewType];
-                    var View = viewRegistry.get(params.viewType);
+                    var viewInfo = viewsInfo[viewType];
+                    var View = viewRegistry.get(viewType);
                     var view = new View(viewInfo, {
                         action: action,
                         context: context,
-                        domain: params.domain,
-                        groupBy: context.group_by,
+                        domain: domain,
+                        groupBy: context.group_by || [],
                         modelName: action.res_model,
                         hasSelectors: false,
                     });