[MERGE] Forward-port of saas-14 up to 9b3ca1af23433e2871ac64ec967a931fd0336658

2 files changed, 8 insertions, 2 deletions

diff --git a/addons/web/static/src/js/action_manager.js b/addons/web/static/src/js/action_manager.js
index f7b81554bb4..9833d52fa1d 100644
--- a/addons/web/static/src/js/action_manager.js
+++ b/addons/web/static/src/js/action_manager.js
@@ -175,13 +175,18 @@ var ViewManagerAction = WidgetAction.extend({
      * @param {int} [scrollTop] the number of pixels to scroll
      */
     set_scrollTop: function(scrollTop) {
-        this.widget.active_view.controller.set_scrollTop(scrollTop);
+        if (this.widget.active_view && this.widget.active_view.controller) {
+            this.widget.active_view.controller.set_scrollTop(scrollTop);
+        }
     },
     /**
      * @return {int} the number of pixels the webclient is scrolled when leaving the action
      */
     get_scrollTop: function() {
-        return this.widget.active_view.controller.get_scrollTop();
+        if (this.widget.active_view && this.widget.active_view.controller) {
+            return this.widget.active_view.controller.get_scrollTop();
+        }
+        return this._super.apply(this, arguments);
     },
     /**
      * @return {Array} array of Objects that will be interpreted to display the breadcrumbs
diff --git a/addons/web/static/src/js/widgets/debug_manager.js b/addons/web/static/src/js/widgets/debug_manager.js
index 2b207a9bb52..1ae85c6f7d1 100644
--- a/addons/web/static/src/js/widgets/debug_manager.js
+++ b/addons/web/static/src/js/widgets/debug_manager.js
@@ -163,6 +163,7 @@ var DebugManager = Widget.extend({
             res_model: 'ir.ui.view',
             title: _t('Select a view'),
             disable_multiple_selection: true,
+            domain: [['type', '!=', 'qweb'], ['type', '!=', 'search']],
             on_selected: function (element_ids) {
                 new Model('ir.ui.view')
                     .query(['name', 'model', 'type'])