diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index 421f04bc..96a5d03f 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'odoo 14,13 Customize OEM(Boost, Data reset)', - 'version': '13.21.08.04', + 'version': '13.21.08.30', 'author': 'Sunpop.cn', 'category': 'Productivity', 'website': 'https://www.sunpop.cn', @@ -80,6 +80,7 @@ 37. Easy noupdate manage for External Identifiers(xml_id) 38. Add Draggable Dialog enable. 39. Only erp manager can see debug menu.. + 40. Fix support for enterprise version. This module can help to white label the Odoo. Also helpful for training and support for your odoo end-user. diff --git a/app_odoo_customize/static/src/js/customize_user_menu.js b/app_odoo_customize/static/src/js/customize_user_menu.js index cefa6260..7c9fdb6e 100644 --- a/app_odoo_customize/static/src/js/customize_user_menu.js +++ b/app_odoo_customize/static/src/js/customize_user_menu.js @@ -24,7 +24,8 @@ odoo.define('app_odoo_customize.UserMenu', function (require) { var self = this; var session = this.getSession(); var lang_list = ''; - this.is_manager = false; + self.is_manager = false; + self.show_debug = false; self._rpc({ model: 'res.lang', @@ -73,10 +74,8 @@ odoo.define('app_odoo_customize.UserMenu', function (require) { $('switch-lang').hide(); } //注意, odoo12,主用户id=2, 加了个 __system__ - if (session.user_context.uid > 2 || (val.key == 'app_show_debug' && val.value == "False")) { - $('[data-menu="debug"]').hide(); - $('[data-menu="debugassets"]').hide(); - $('[data-menu="quitdebug"]').hide(); + if (val.key == 'app_show_debug' && val.value == "True") { + self.show_debug = true; } if (val.key == 'app_show_documentation' && val.value == "False") { $('[data-menu="documentation"]').hide(); @@ -97,6 +96,11 @@ odoo.define('app_odoo_customize.UserMenu', function (require) { $('.o_sub_menu_footer').hide(); } }); + if (!self.show_debug || !session.is_admin) { + $('[data-menu="debug"]').hide(); + $('[data-menu="debugassets"]').hide(); + $('[data-menu="quitdebug"]').hide(); + } }) }, /** @@ -105,7 +109,12 @@ odoo.define('app_odoo_customize.UserMenu', function (require) { */ async willStart() { await this._super(...arguments); - this.is_manager = await session.user_has_group('base.group_erp_manager'); + var self = this; + try { + self.is_manager = await session.user_has_group('base.group_erp_manager'); + } catch { + self.is_manager = false; + } }, start: function () { var self = this; @@ -116,18 +125,37 @@ odoo.define('app_odoo_customize.UserMenu', function (require) { var f = self['_onMenuLang'] f.call(self, $(this)); }); - //控制debug显示 - var mMode = 'normal'; - if (window.location.href.indexOf('debug=1') != -1) - mMode = 'debug'; - if (window.location.href.indexOf('debug=assets') != -1) - mMode = 'assets'; - if (mMode == 'normal') - $('[data-menu="quitdebug"]').hide(); - if (mMode == 'debug') - $('[data-menu="debug"]').hide(); - if (mMode == 'assets') - $('[data-menu="debugassets"]').hide(); + if (!self.show_debug || !self.is_manager) { + setTimeout(function () { + $('[data-menu="debug"]').hide(); + $('[data-menu="debugassets"]').hide(); + $('[data-menu="quitdebug"]').hide(); + }, 500) + } + // if (self.is_manager) { + // //控制debug显示 + // var mMode = 'normal'; + // if (window.location.href.indexOf('debug=1') != -1) + // mMode = 'debug'; + // if (window.location.href.indexOf('debug=assets') != -1) + // mMode = 'assets'; + // + // if (mMode == 'normal') { + // $('[data-menu="debug"]').show(); + // $('[data-menu="debugassets"]').show(); + // $('[data-menu="quitdebug"]').hide(); + // } + // if (mMode == 'debug'){ + // $('[data-menu="debug"]').hide(); + // $('[data-menu="debugassets"]').show(); + // $('[data-menu="quitdebug"]').show(); + // } + // if (mMode == 'assets') { + // $('[data-menu="debug"]').show(); + // $('[data-menu="debugassets"]').hide(); + // $('[data-menu="quitdebug"]').show(); + // } + // } }); }, _onMenuAccount: function () { diff --git a/app_odoo_customize/static/src/xml/customize_user_menu.xml b/app_odoo_customize/static/src/xml/customize_user_menu.xml index 06907183..8662379b 100644 --- a/app_odoo_customize/static/src/xml/customize_user_menu.xml +++ b/app_odoo_customize/static/src/xml/customize_user_menu.xml @@ -3,9 +3,9 @@ - Activate the developer mode - Activate the developer mode (with assets) - Deactivate the developer mode + Activate the developer mode + Activate the developer mode (with assets) + Deactivate the developer mode