From 94c5caa4d6984fec0ac468fc0cc2232c9c8498a4 Mon Sep 17 00:00:00 2001 From: Gorash Date: Wed, 19 Jan 2022 12:52:22 +0000 Subject: [PATCH] [REV] website: revert commit ability to restrict groups on website menu revert https://github.com/odoo/odoo/commit/b5091c7017a08806e2730765c14261408307aeec fp asks to remove the groups on the menus to simplify the model and allow the menu to be cached in the future. The user can change the templates, use the big menu, add custom t-if, groups... task-2737973 closes odoo/odoo#83505 Related: odoo/upgrade#3208 Signed-off-by: Romain Derie (rde) --- addons/website/models/website_menu.py | 4 +--- addons/website/security/website_security.xml | 6 ------ addons/website/views/website_views.xml | 2 -- addons/website_forum/controllers/main.py | 2 -- addons/website_forum/models/forum.py | 4 ---- 5 files changed, 1 insertion(+), 17 deletions(-) diff --git a/addons/website/models/website_menu.py b/addons/website/models/website_menu.py index 81f6678b7cc..b00657c1683 100644 --- a/addons/website/models/website_menu.py +++ b/addons/website/models/website_menu.py @@ -43,8 +43,6 @@ class Menu(models.Model): child_id = fields.One2many('website.menu', 'parent_id', string='Child Menus') parent_path = fields.Char(index=True, unaccent=False) is_visible = fields.Boolean(compute='_compute_visible', string='Is Visible') - group_ids = fields.Many2many('res.groups', string='Visible Groups', - help="User need to be at least in one of these groups to see the menu") is_mega_menu = fields.Boolean(compute=_compute_field_is_mega_menu, inverse=_set_field_is_mega_menu) mega_menu_content = fields.Html(translate=html_translate, sanitize=False, prefetch=True) mega_menu_classes = fields.Char() @@ -101,7 +99,7 @@ class Menu(models.Model): def write(self, values): res = super().write(values) - if 'website_id' in values or 'group_ids' in values or 'sequence' in values: + if 'website_id' in values or 'sequence' in values: self.clear_caches() return res diff --git a/addons/website/security/website_security.xml b/addons/website/security/website_security.xml index 60948552a0c..566fac8df09 100644 --- a/addons/website/security/website_security.xml +++ b/addons/website/security/website_security.xml @@ -29,12 +29,6 @@ - - Website menu: group_ids - - ['|', ('group_ids', '=', False), ('group_ids', 'in', user.groups_id.ids)] - - website_designer: Manage Website and qWeb view diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml index e4f9d6be6cb..e3de1c49ee1 100644 --- a/addons/website/views/website_views.xml +++ b/addons/website/views/website_views.xml @@ -193,7 +193,6 @@ - diff --git a/addons/website_forum/controllers/main.py b/addons/website_forum/controllers/main.py index ffdcb2d8782..c14eeca9aaf 100644 --- a/addons/website_forum/controllers/main.py +++ b/addons/website_forum/controllers/main.py @@ -77,13 +77,11 @@ class WebsiteForum(WebsiteProfile): forum['authorized_group_id'] = forum_privacy_group forum_id = request.env['forum.forum'].create(forum) if add_menu: - group = [int(forum_privacy_group)] if forum_privacy == 'private' else [request.env.ref('base.group_portal').id, request.env.ref('base.group_user').id] menu_id = request.env['website.menu'].create({ 'name': forum_name, 'url': "/forum/%s" % slug(forum_id), 'parent_id': request.website.menu_id.id, 'website_id': request.website.id, - 'group_ids': [(6, 0, group)] }) forum_id.menu_id = menu_id return "/forum/%s" % slug(forum_id) diff --git a/addons/website_forum/models/forum.py b/addons/website_forum/models/forum.py index 5b7f9efbfeb..73dda8e29ea 100644 --- a/addons/website_forum/models/forum.py +++ b/addons/website_forum/models/forum.py @@ -206,12 +206,8 @@ class Forum(models.Model): elif vals['privacy'] == 'public': # The forum is public, the menu must be also public vals['authorized_group_id'] = False - self.menu_id.write({'group_ids': [(5, 0, 0)]}) elif vals['privacy'] == 'connected': vals['authorized_group_id'] = False - self.menu_id.write({'group_ids': [(6, 0, [self.env.ref('base.group_portal').id, self.env.ref('base.group_user').id])]}) - if 'authorized_group_id' in vals and vals['authorized_group_id']: - self.menu_id.write({'group_ids': [(6, 0, [vals['authorized_group_id']])]}) res = super(Forum, self).write(vals) if 'active' in vals: