From a38d98a3c6fafa6fc17d3e2ec49732b5e7a821f0 Mon Sep 17 00:00:00 2001 From: Ivan Office Date: Tue, 5 Mar 2024 19:57:31 +0800 Subject: [PATCH] fix odoo customize --- app_odoo_customize/__manifest__.py | 4 ++-- app_odoo_customize/controllers/controllers.py | 4 ++-- app_odoo_customize/i18n/zh_CN.po | 2 +- app_odoo_customize/models/mail_thread.py | 12 ++++-------- app_odoo_customize/models/res_config_settings.py | 2 +- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/app_odoo_customize/__manifest__.py b/app_odoo_customize/__manifest__.py index 2c88e80d..f3044a23 100644 --- a/app_odoo_customize/__manifest__.py +++ b/app_odoo_customize/__manifest__.py @@ -23,7 +23,7 @@ { 'name': 'odoo17 Tweak,Ai Employee,Boost,Customize All in One. Customize,UI,Boost,Security,Data', - 'version': '16.24.01.15', + 'version': '16.24.03.05', 'author': 'odooai.cn', 'category': 'Extra Tools', 'website': 'https://www.odooai.cn', @@ -39,7 +39,7 @@ 'depends': [ 'app_common', 'base_setup', - 'web', + 'portal', 'mail', # 'digest', # when enterprise diff --git a/app_odoo_customize/controllers/controllers.py b/app_odoo_customize/controllers/controllers.py index e702c623..71cd90bb 100644 --- a/app_odoo_customize/controllers/controllers.py +++ b/app_odoo_customize/controllers/controllers.py @@ -11,8 +11,8 @@ class AppHome(Home): def web_client(self, s_action=None, **kw): # todo: 当前只对 web，要调整为也对 website res = super(AppHome, self).web_client(s_action, **kw) - - if kw.get('debug', False): + if request.session.uid and request.env['res.users'].sudo().browse(request.session.uid).has_group('base.group_user') \ + and kw.get('debug', False): config_parameter = request.env['ir.config_parameter'].sudo() app_debug_only_admin = config_parameter.get_param('app_debug_only_admin') if request.session.uid and request.env.user.browse(request.session.uid)._is_admin(): diff --git a/app_odoo_customize/i18n/zh_CN.po b/app_odoo_customize/i18n/zh_CN.po index 5ec36670..dbef08df 100644 --- a/app_odoo_customize/i18n/zh_CN.po +++ b/app_odoo_customize/i18n/zh_CN.po @@ -637,7 +637,7 @@ msgstr "显示支持" #. module: app_odoo_customize #: model:ir.model.fields,field_description:app_odoo_customize.field_res_config_settings__app_stop_subscribe -msgid "Stop Odoo Subscribe" +msgid "Stop Odoo Subscribe / Follow" msgstr "停止Odoo订阅" #. module: app_odoo_customize diff --git a/app_odoo_customize/models/mail_thread.py b/app_odoo_customize/models/mail_thread.py index 7421b3a4..d859ceee 100644 --- a/app_odoo_customize/models/mail_thread.py +++ b/app_odoo_customize/models/mail_thread.py @@ -13,8 +13,7 @@ class MailThread(models.AbstractModel): app_stop_subscribe = True if ir_config.get_param('app_stop_subscribe', False) == "True" else False if app_stop_subscribe: return True - else: - return super(MailThread, self).message_subscribe(partner_ids, subtype_ids) + return super(MailThread, self).message_subscribe(partner_ids, subtype_ids) def _message_subscribe(self, partner_ids=None, channel_ids=None, subtype_ids=None, customer_ids=None): """ 停用订阅功能. """ @@ -22,8 +21,7 @@ class MailThread(models.AbstractModel): app_stop_subscribe = True if ir_config.get_param('app_stop_subscribe', False) == "True" else False if app_stop_subscribe: return True - else: - return super(MailThread, self)._message_subscribe(partner_ids, subtype_ids, customer_ids) + return super(MailThread, self)._message_subscribe(partner_ids, subtype_ids, customer_ids) def _message_auto_subscribe_followers(self, updated_values, default_subtype_ids): """ 停用订阅功能. """ @@ -31,8 +29,7 @@ class MailThread(models.AbstractModel): app_stop_subscribe = True if ir_config.get_param('app_stop_subscribe', False) == "True" else False if app_stop_subscribe: return [] - else: - return super(MailThread, self)._message_auto_subscribe_followers(updated_values, default_subtype_ids) + return super(MailThread, self)._message_auto_subscribe_followers(updated_values, default_subtype_ids) def _message_auto_subscribe_notify(self, partner_ids, template): """ 停用订阅功能. """ @@ -40,5 +37,4 @@ class MailThread(models.AbstractModel): app_stop_subscribe = True if ir_config.get_param('app_stop_subscribe', False) == "True" else False if app_stop_subscribe: return True - else: - return super(MailThread, self)._message_auto_subscribe_notify(partner_ids, template) + return super(MailThread, self)._message_auto_subscribe_notify(partner_ids, template) diff --git a/app_odoo_customize/models/res_config_settings.py b/app_odoo_customize/models/res_config_settings.py index 8b40c93c..67c558fe 100644 --- a/app_odoo_customize/models/res_config_settings.py +++ b/app_odoo_customize/models/res_config_settings.py @@ -58,7 +58,7 @@ class ResConfigSettings(models.TransientModel): # 安全与提速 app_debug_only_admin = fields.Boolean('Debug for Admin', config_parameter='app_debug_only_admin', help="Check to only Debug / Debug Assets for Odoo Admin. Deny debug from url for other user.") - app_stop_subscribe = fields.Boolean('Stop Odoo Subscribe', help="Check to stop subscribe and follow. This to make odoo speed up.", + app_stop_subscribe = fields.Boolean('Stop Odoo Subscribe / Follow', help="Check to stop subscribe and follow. This to make odoo speed up.", config_parameter='app_stop_subscribe') # 处理额外模块 module_app_odoo_doc = fields.Boolean("Help Document Anywhere", help='Get Help Documentation on current odoo operation or topic.')