From 2870af3b4989088e80922cfa7d48e84d3ab8bc4b Mon Sep 17 00:00:00 2001
From: Simon Lejeune <sle@openerp.com>
Date: Mon, 30 Jun 2014 19:45:12 +0200
Subject: [PATCH] [FIX] navbar cache: do not use ormcache as it does not handle
 kwargs. instead, only get the root menu_ids in rendering context

---
 addons/web/views/webclient_templates.xml |  2 +-
 addons/website/models/ir_ui_view.py      |  2 +-
 openerp/addons/base/ir/ir_ui_menu.py     | 13 ++++++++++++-
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/addons/web/views/webclient_templates.xml b/addons/web/views/webclient_templates.xml
index ddcff3b73bb..e8ab40d9b3d 100644
--- a/addons/web/views/webclient_templates.xml
+++ b/addons/web/views/webclient_templates.xml
@@ -184,7 +184,7 @@
         <template id="web.menu_link">
             <t t-set="debug_param" t-value="'?&amp;debug=' if debug else ''"/>
             <a t-att-href="'/web%s#menu_id=%s&amp;action=%s' % (debug_param, menu['id'], menu['action'] and menu['action'].split(',')[1] or '')"
-                t-att-class="'oe_menu_toggler' if menu['children'] else 'oe_menu_leaf'"
+                t-att-class="'oe_menu_toggler' if menu.get('children') else 'oe_menu_leaf'"
                 t-att-data-menu="menu['id']"
                 t-att-data-action-model="menu['action'] and menu['action'].split(',')[0] or ''"
                 t-att-data-action-id="menu['action'] and menu['action'].split(',')[1] or ''">
diff --git a/addons/website/models/ir_ui_view.py b/addons/website/models/ir_ui_view.py
index 40d1d4e5945..957c8e19c3b 100644
--- a/addons/website/models/ir_ui_view.py
+++ b/addons/website/models/ir_ui_view.py
@@ -151,7 +151,7 @@ class view(osv.osv):
                 user_id=self.pool.get("res.users").browse(cr, uid, uid),
                 translatable=context.get('lang') != request.website.default_lang_code,
                 editable=request.website.is_publisher(),
-                menu_data=self.pool['ir.ui.menu'].load_menus(cr, uid, context=context) if request.website.is_user() else None,
+                menu_data=self.pool['ir.ui.menu'].load_menus_root(cr, uid, context=context) if request.website.is_user() else None,
             )
 
             # add some values
diff --git a/openerp/addons/base/ir/ir_ui_menu.py b/openerp/addons/base/ir/ir_ui_menu.py
index 718dcb0c36c..60014be9e01 100644
--- a/openerp/addons/base/ir/ir_ui_menu.py
+++ b/openerp/addons/base/ir/ir_ui_menu.py
@@ -349,7 +349,18 @@ class ir_ui_menu(osv.osv):
         menu_domain = [('parent_id', '=', False)]
         return self.search(cr, uid, menu_domain, context=context)
 
-    @tools.ormcache()
+    def load_menus_root(self, cr, uid, context=None):
+        fields = ['name', 'sequence', 'parent_id', 'action']
+        menu_root_ids = self.get_user_roots(cr, uid, context=context)
+        menu_roots = self.read(cr, uid, menu_root_ids, fields, context=context) if menu_root_ids else []
+        return {
+            'id': False,
+            'name': 'root',
+            'parent_id': [-1, ''],
+            'children': menu_roots,
+            'all_menu_ids': menu_root_ids,
+        }
+
     def load_menus(self, cr, uid, context=None):
         """ Loads all menu items (all applications and their sub-menus).