summaryrefslogtreecommitdiff
path: root/addons/web_settings_dashboard/static
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-09-13 19:30:33 +0200
committerChristophe Simonis <chs@odoo.com>2018-09-13 19:30:33 +0200
commitf3fa5a5ef7d2e86a38f988f799a0ea33304d1e14 (patch)
treea73fd937fa8f23ae016070ec14c0a2a21621ed68 /addons/web_settings_dashboard/static
parent5cfd3d5fa022e8cafb3da3d2468cc8364f0e47b3 (diff)
parent1e0a92c99626c30aa7a196c1f970b75294dbf2d0 (diff)
[MERGE] forward port branch saas-11.3 up to 1e0a92c9962
Diffstat (limited to 'addons/web_settings_dashboard/static')
-rw-r--r--addons/web_settings_dashboard/static/src/js/dashboard.js1
-rw-r--r--addons/web_settings_dashboard/static/tests/dashboard_tests.js4
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 9f0ed3d7552..3b62be2228f 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 c96087934d1..306ff7f363a 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();
};