[MERGE] forward port branch saas-11.2 up to eefca5d492d

2 files changed, 18 insertions, 1 deletions

diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js
index 56c6e45a08d..7963af8ec32 100644
--- a/addons/web/static/src/js/chrome/action_manager_act_window.js
+++ b/addons/web/static/src/js/chrome/action_manager_act_window.js
@@ -159,6 +159,14 @@ ActionManager.include({
      */
     _createViewController: function (action, viewType, viewOptions, options) {
         var self = this;
+        var viewDescr = _.findWhere(action.views, {type: viewType});
+        if (!viewDescr) {
+            // the requested view type isn't specified in the action (e.g.
+            // action with list view only, user clicks on a row in the list, it
+            // tries to switch to form view)
+            return $.Deferred().reject();
+        }
+
         var controllerID = _.uniqueId('controller_');
         var controller = {
             actionID: action.jsID,
@@ -184,7 +192,6 @@ ActionManager.include({
             // communication with trigger_up (e.g. for 'env_updated' event)
             viewOptions = _.extend(viewOptions, { controllerID: controllerID });
 
-            var viewDescr = _.findWhere(action.views, {type: viewType});
             var view = new viewDescr.Widget(viewDescr.fieldsView, viewOptions);
             var def = $.Deferred();
             action.controllers[viewType] = def;
diff --git a/addons/web/static/src/js/views/kanban/kanban_renderer.js b/addons/web/static/src/js/views/kanban/kanban_renderer.js
index 4236ce74da4..6721f6d446c 100644
--- a/addons/web/static/src/js/views/kanban/kanban_renderer.js
+++ b/addons/web/static/src/js/views/kanban/kanban_renderer.js
@@ -302,6 +302,16 @@ var KanbanRenderer = BasicRenderer.extend({
         }
     },
     /**
+     * @private
+     * @override
+     * adds a specific class to the kanban helper so that it can be targetted by specific css
+     */
+    _renderNoContentHelper: function() {
+        var $el = this._super.apply(this, arguments);
+        $el.toggleClass('o_kanban_view_nocontent',true)
+        return $el;
+    },
+    /**
      * Renders an ungrouped kanban view in a fragment.
      *
      * @private