[FIX] Menu : Search corrected for count attribute and non-admin user

bzr revid: jvo@tinyerp.com-20100514124610-n8dtqbpn6myjwrpe

diff --git a/bin/addons/base/ir/ir_ui_menu.py b/bin/addons/base/ir/ir_ui_menu.py
index 953c9b5..87afaf8 100644 (file)
--- a/bin/addons/base/ir/ir_ui_menu.py
+++ b/bin/addons/base/ir/ir_ui_menu.py
@@ -77,7 +77,7 @@ class ir_ui_menu(osv.osv):
         ids = super(ir_ui_menu, self).search(cr, uid, args, super_offset,
                                              super_limit, order,
                                              context=context, count=super_count)
-        if uid == 1:
+        if uid == 1 or count:
             return ids
 
         if not ids:
@@ -85,8 +85,6 @@ class ir_ui_menu(osv.osv):
                 return 0
             return []
         
-        if count and ids:
-            return ids
 
         modelaccess = self.pool.get('ir.model.access')
         user_groups = set(self.pool.get('res.users').read(cr, 1, uid, ['groups_id'])['groups_id'])