[MERGE] forward port branch 11.0 up to 44b77d3702b

2 files changed, 65 insertions, 2 deletions

diff --git a/addons/board/static/src/js/dashboard.js b/addons/board/static/src/js/dashboard.js
index ca9ace9422b..f0cb213f022 100644
--- a/addons/board/static/src/js/dashboard.js
+++ b/addons/board/static/src/js/dashboard.js
@@ -116,10 +116,9 @@ FormController.include({
         this.do_action({
             type: 'ir.actions.act_window',
             res_model: event.data.model,
-            views: [[false, 'form']],
+            views: [[event.data.formViewID || false, 'form']],
             res_id: event.data.res_id,
         });
-
     },
 
 });
@@ -133,6 +132,9 @@ FormRenderer.include({
         'click .oe_dashboard_link_change_layout': '_onChangeLayout',
         'click .oe_dashboard_column .oe_close': '_onCloseAction',
     }),
+    custom_events: _.extend({}, FormRenderer.prototype.custom_events, {
+        switch_view: '_onSwitchView',
+    }),
 
     /**
      * @override
@@ -142,6 +144,7 @@ FormRenderer.include({
         this.noContentHelp = params.noContentHelp;
         this.actionsDescr = {};
         this._boardSubcontrollers = []; // for board: controllers of subviews
+        this._boardFormViewIDs = {}; // for board: mapping subview controller to form view id
     },
     /**
      * Call `on_attach_callback` for each subview
@@ -268,6 +271,11 @@ FormRenderer.include({
                         hasSelectors: false,
                     });
                     return view.getController(self).then(function (controller) {
+                        self._boardFormViewIDs[controller.handle] = _.first(
+                            _.find(action.views, function (descr) {
+                                return descr[1] === 'form';
+                            })
+                        );
                         self._boardSubcontrollers.push(controller);
                         return controller.appendTo(params.$node);
                     });
@@ -396,6 +404,16 @@ FormRenderer.include({
         $action.find('.oe_content').toggle();
         this.trigger_up('save_dashboard');
     },
+    /**
+     * Let FormController know which form view it should display based on the
+     * window action of the sub controller that is switching view
+     *
+     * @private
+     * @param {OdooEvent} event
+     */
+    _onSwitchView: function (event) {
+        event.data.formViewID = this._boardFormViewIDs[event.target.handle];
+    },
 });
 
 });
diff --git a/addons/board/static/tests/dashboard_tests.js b/addons/board/static/tests/dashboard_tests.js
index 09af3e8e2cb..2680e7ea198 100644
--- a/addons/board/static/tests/dashboard_tests.js
+++ b/addons/board/static/tests/dashboard_tests.js
@@ -272,6 +272,51 @@ QUnit.test('can open a record', function (assert) {
     form.destroy();
 });
 
+QUnit.test('can open record using action form view', function (assert) {
+    assert.expect(1);
+
+    var form = createView({
+        View: FormView,
+        model: 'board',
+        data: this.data,
+        arch: '<form string="My Dashboard">' +
+                '<board style="2-1">' +
+                    '<column>' +
+                        '<action context="{}" view_mode="list" string="ABC" name="51" domain="[]"></action>' +
+                    '</column>' +
+                '</board>' +
+            '</form>',
+        mockRPC: function (route) {
+            if (route === '/web/action/load') {
+                return $.when({
+                    res_model: 'partner',
+                    views: [[4, 'list'], [5, 'form']],
+                });
+            }
+            return this._super.apply(this, arguments);
+        },
+        archs: {
+            'partner,4,list':
+                '<tree string="Partner"><field name="foo"/></tree>',
+            'partner,5,form':
+                '<form string="Partner"><field name="display_name"/></form>',
+        },
+        intercepts: {
+            do_action: function (event) {
+                assert.deepEqual(event.data.action, {
+                    res_id: 1,
+                    res_model: 'partner',
+                    type: 'ir.actions.act_window',
+                    views: [[5, 'form']],
+                }, "should do a do_action with correct parameters");
+            },
+        },
+    });
+
+    form.$('tr.o_data_row td:contains(yop)').click();
+    form.destroy();
+});
+
 QUnit.test('can drag and drop a view', function (assert) {
     assert.expect(4);