From 2aaad4d256fea182878ebd054733235aba636b47 Mon Sep 17 00:00:00 2001 From: Yannick Tivisse Date: Wed, 17 Aug 2016 10:07:51 +0200 Subject: [PATCH] Revert "[IMP] web,web_settings_dashboard: Move 'About' menu to settings dashboard" This reverts commit 328af5dc8608172505fa6761190bf349e7656d89. --- addons/web/static/src/js/widgets/user_menu.js | 22 ++++++++ addons/web/static/src/xml/base.xml | 45 ++++++++++++++++ .../controllers/main.py | 9 +--- .../static/src/js/dashboard.js | 18 +------ .../static/src/xml/dashboard.xml | 53 +------------------ 5 files changed, 70 insertions(+), 77 deletions(-) diff --git a/addons/web/static/src/js/widgets/user_menu.js b/addons/web/static/src/js/widgets/user_menu.js index 3c65ab3ac49..7b4e4d05b25 100644 --- a/addons/web/static/src/js/widgets/user_menu.js +++ b/addons/web/static/src/js/widgets/user_menu.js @@ -46,6 +46,28 @@ var UserMenu = Widget.extend({ on_menu_support: function () { window.open('https://www.odoo.com/buy', '_blank'); }, + on_menu_about: function () { + var self = this; + if (odoo.db_info) { + menu_help_about(odoo.db_info); + } else { + this.rpc("/web/webclient/version_info", {}).done(menu_help_about); + } + + function menu_help_about(db_info) { + var $help = $(QWeb.render("UserMenu.about", {db_info: db_info, debug: core.debug})); + $help.find('a.oe_activate_debug_mode').click(function (e) { + e.preventDefault(); + window.location = $.param.querystring(window.location.href, 'debug'); + }); + new Dialog(self, { + size: 'medium', + dialogClass: 'o_act_window', + title: _t("About"), + $content: $help + }).open(); + } + }, on_menu_settings: function() { var self = this; this.trigger_up('clear_uncommitted_changes', { diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index a9f51b12c48..79f344bd0df 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1276,6 +1276,7 @@