[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) <rde@odoo.com>
This commit is contained in:
Gorash
2022-02-18 14:28:40 +00:00
parent ec0109b7b2
commit 94c5caa4d6
5 changed files with 1 additions and 17 deletions
+1 -3
View File
@@ -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
@@ -29,12 +29,6 @@
<data noupdate="1">
<record id="website_menu" model="ir.rule">
<field name="name">Website menu: group_ids</field>
<field name="model_id" ref="model_website_menu"/>
<field name="domain_force">['|', ('group_ids', '=', False), ('group_ids', 'in', user.groups_id.ids)]</field>
</record>
<record id="website_designer_edit_qweb" model="ir.rule">
<field name="name">website_designer: Manage Website and qWeb view</field>
<field name="model_id" ref="base.model_ir_ui_view"/>
-2
View File
@@ -193,7 +193,6 @@
</group>
<group>
<field name="parent_id" context="{'display_website': True}"/>
<field name="group_ids"/>
</group>
</group>
<label for="child_id" string="Child Menus"/>
@@ -222,7 +221,6 @@
<field name="is_mega_menu"/>
<field name="new_window"/>
<field name="parent_id" context="{'display_website': True}"/>
<field name="group_ids" widget="many2many_tags"/>
</tree>
</field>
</record>
-2
View File
@@ -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)
-4
View File
@@ -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: