[MERGE] forward port branch 11.0 up to c3ea0a78113

2 files changed, 3 insertions, 2 deletions

diff --git a/addons/web_settings_dashboard/static/src/js/dashboard.js b/addons/web_settings_dashboard/static/src/js/dashboard.js
index d5705c80e42..19d5dfa9f43 100644
--- a/addons/web_settings_dashboard/static/src/js/dashboard.js
+++ b/addons/web_settings_dashboard/static/src/js/dashboard.js
@@ -4,6 +4,7 @@ odoo.define('web_settings_dashboard', function (require) {
 var AbstractAction = require('web.AbstractAction');
 var core = require('web.core');
 var framework = require('web.framework');
+var session = require('web.session');
 var Widget = require('web.Widget');
 
 var QWeb = core.qweb;
diff --git a/addons/web_settings_dashboard/static/tests/dashboard_tests.js b/addons/web_settings_dashboard/static/tests/dashboard_tests.js
index 9ff65c32783..8ebd1fe7cdb 100644
--- a/addons/web_settings_dashboard/static/tests/dashboard_tests.js
+++ b/addons/web_settings_dashboard/static/tests/dashboard_tests.js
@@ -11,12 +11,12 @@ var Dashboard = webSettingsDashboard.Dashboard;
 function createDashboard(params) {
     var widget = new Widget();
     var dashboard = new Dashboard(widget);
-    dashboard.all_dashboards = ['invitations']; // test only user invitations
+    dashboard.all_dashboards = params.dashboards || ['invitations']; // test only user invitations
 
     testUtils.addMockEnvironment(widget, params);
 
     var originalDestroy = Dashboard.prototype.destroy;
-    Dashboard.destroy = function () {
+    dashboard.destroy = function () {
         dashboard.destroy = originalDestroy;
         widget.destroy();
     };