diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py index 070b885bc64..7c92478d231 100644 --- a/addons/website/models/ir_ui_view.py +++ b/addons/website/models/ir_ui_view.py @@ -312,9 +312,13 @@ class View(models.Model): new_context = dict(self._context, inherit_branding=True) elif request.env.user.has_group('website.group_website_publisher'): new_context = dict(self._context, inherit_branding_auto=True) - # Fallback incase main_object dont't inherit 'website.seo.metadata' - if values and 'main_object' in values and not hasattr(values['main_object'], 'get_website_meta'): - values['main_object'].get_website_meta = lambda: {} + if values and 'main_object' in values: + func = getattr(values['main_object'], 'get_backend_menu_id', False) + values['backend_menu_id'] = func and func() or self.env.ref('website.menu_website_configuration').id + + # Fallback incase main_object dont't inherit 'website.seo.metadata' + if not hasattr(values['main_object'], 'get_website_meta'): + values['main_object'].get_website_meta = lambda: {} if self._context != new_context: self = self.with_context(new_context) @@ -333,9 +337,6 @@ class View(models.Model): translatable = editable and self._context.get('lang') != request.env['ir.http']._get_default_lang().code editable = not translatable and editable - if 'main_object' not in qcontext: - qcontext['main_object'] = self - cur = Website.get_current_website() if self.env.user.has_group('website.group_website_publisher') and self.env.user.has_group('website.group_multi_website'): qcontext['multi_website_websites_current'] = {'website_id': cur.id, 'name': cur.name, 'domain': cur._get_http_domain()} @@ -353,6 +354,7 @@ class View(models.Model): qcontext.update(dict( self._context.copy(), + main_object=self, website=request.website, url_for=url_for, res_company=request.website.company_id.sudo(), diff --git a/addons/website/views/website_navbar_templates.xml b/addons/website/views/website_navbar_templates.xml index 72cbab468de..37d3ada9b50 100644 --- a/addons/website/views/website_navbar_templates.xml +++ b/addons/website/views/website_navbar_templates.xml @@ -159,12 +159,12 @@