diff --git a/addons/website/controllers/backend.py b/addons/website/controllers/backend.py index ab9800f656b..e5a2ecfa87e 100644 --- a/addons/website/controllers/backend.py +++ b/addons/website/controllers/backend.py @@ -11,13 +11,6 @@ class WebsiteBackend(http.Controller): def fetch_dashboard_data(self, date_from, date_to): has_group_system = request.env.user.has_group('base.group_system') has_group_designer = request.env.user.has_group('website.group_website_designer') - if has_group_system: - apps_data = dict((app['name'], app) for app in request.env['ir.module.module'].sudo().search_read( - ['|', ('name', 'ilike', 'website'), ('application', '=', True)], - ['id', 'sequence', 'name', 'shortdesc', 'state'], - order='sequence ASC')) - else: - apps_data = {} dashboard_data = { 'groups': { 'system': has_group_system, @@ -25,7 +18,6 @@ class WebsiteBackend(http.Controller): }, 'currency': request.env.user.company_id.currency_id.id, 'dashboards': { - 'apps_data': apps_data, 'visits': {}, } } diff --git a/addons/website/static/src/js/backend/dashboard.js b/addons/website/static/src/js/backend/dashboard.js index c140e61c3e5..3fd7a79161d 100644 --- a/addons/website/static/src/js/backend/dashboard.js +++ b/addons/website/static/src/js/backend/dashboard.js @@ -10,8 +10,6 @@ var session = require('web.session'); var web_client = require('web.web_client'); var Widget = require('web.Widget'); -var local_storage = require('web.local_storage'); - var _t = core._t; var QWeb = core.qweb; @@ -29,7 +27,6 @@ var Dashboard = Widget.extend(ControlPanelMixin, { 'click .js_link_analytics_settings': 'on_link_analytics_settings', 'click .o_dashboard_action': 'on_dashboard_action', 'click .o_dashboard_action_form': 'on_dashboard_action_form', - 'click .o_dashboard_hide_panel': 'on_dashboard_hide_panel', }, init: function(parent, context) { @@ -38,7 +35,6 @@ var Dashboard = Widget.extend(ControlPanelMixin, { this.date_range = 'week'; // possible values : 'week', 'month', year' this.date_from = moment().subtract(1, 'week'); this.date_to = moment(); - this.hidden_apps = JSON.parse(local_storage.getItem('website_dashboard_hidden_app_ids') || '[]'); this.dashboards_templates = ['website.dashboard_visits']; this.graphs = []; @@ -277,18 +273,6 @@ var Dashboard = Widget.extend(ControlPanelMixin, { }); }, - on_dashboard_hide_panel: function (ev) { - ev.preventDefault(); - ev.stopPropagation(); - var $action = $(ev.currentTarget); - // update hidden module list - this.hidden_apps = JSON.parse(local_storage.getItem('website_dashboard_hidden_app_ids') || '[]'); - this.hidden_apps.push(JSON.parse($action.data('module_id'))); - local_storage.setItem('website_dashboard_hidden_app_ids', JSON.stringify(this.hidden_apps)); - // remove box - $action.closest(".o_box_item").remove(); - }, - update_cp: function() { var self = this; if (!this.$searchview) { diff --git a/addons/website/static/src/less/website.backendDashboard.less b/addons/website/static/src/less/website.backendDashboard.less index 2fa66f00d16..c818704e175 100644 --- a/addons/website/static/src/less/website.backendDashboard.less +++ b/addons/website/static/src/less/website.backendDashboard.less @@ -152,30 +152,6 @@ background-color: darken(@odoo-brand-primary, 10%); } } - &.o_apps { - position: relative; - background-color: @odoo-brand-optional; - color: white; - .o_apps_hidden { - display: none; - &.o_dashboard_hide_panel { - position: absolute; - top: 0px; - right: 0px; - background: @brand-danger; - padding: 6px; - } - } - &:hover { - background-color: #45818E; - .o_apps_show { - display: none; - } - .o_apps_hidden { - display: block; - } - } - } .o_highlight { font-size: 27px; } diff --git a/addons/website/static/src/xml/website.backend.xml b/addons/website/static/src/xml/website.backend.xml index e0d467489e6..bc7248bbcf4 100644 --- a/addons/website/static/src/xml/website.backend.xml +++ b/addons/website/static/src/xml/website.backend.xml @@ -15,53 +15,7 @@ -
- -
+
@@ -111,4 +65,5 @@
+