pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] revert previous patch about linked bug (lp:497364)

Browse Source 
lp bug: https://launchpad.net/bugs/497364 fixed

bzr revid: chs@tinyerp.com-20100120165208-ppmd7tq9mqm1jtcu
This commit is contained in:
Christophe Simonis
2010-01-20 17:52:08 +01:00
parent fecc3a360d
commit db13ceee7a
1 changed files with 4 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bin/addons/base/ir/ir_ui_menu.py
+4 -30
View File
@@ -53,7 +53,6 @@ class ir_ui_menu(osv.osv):
def __init__(self, *args, **kwargs):
self._cache = {}
self._parents = []
r = super(ir_ui_menu, self).__init__(*args, **kwargs)
self.pool.get('ir.model.access').register_cache_clearing_method(self._name, 'clear_cache')
return r
@@ -65,35 +64,20 @@ class ir_ui_menu(osv.osv):
def clear_cache(self):
# radical but this doesn't frequently happen
self._cache = {}
self._parents = []
def search(self, cr, uid, args, offset=0, limit=2000, order=None,
context=None, count=False):
if context is None:
context = {}
if uid !=1:
flag = True
for dom in args:
if dom[0] == 'parent_id':
flag = False
break
#Args should add the following domain in order to maintain the integrity of search.
#i.e. if search is performed on list view.
if flag:
args += [('parent_id','child_of',self._parents)]
ids = osv.orm.orm.search(self, cr, uid, args, offset, uid==1 and limit or None, order, context=context, count=(count and uid==1))
ids = osv.orm.orm.search(self, cr, uid, args, offset, limit, order, context=context, count=(count and uid==1))
if uid==1:
if limit and not count:
ids = ids[:int(limit)]
return ids
if not ids:
if count:
return 0
return []
modelaccess = self.pool.get('ir.model.access')
user_groups = set(self.pool.get('res.users').read(cr, 1, uid, ['groups_id'])['groups_id'])
result = []
@@ -103,7 +87,7 @@ class ir_ui_menu(osv.osv):
if key in self._cache:
if self._cache[key]:
result.append(menu.id)
continue
continue
self._cache[key] = False
if menu.groups_id:
@@ -112,8 +96,6 @@ class ir_ui_menu(osv.osv):
continue
result.append(menu.id)
self._cache[key] = True
if not menu.parent_id.id:
self._parents.append(menu.id)
continue
if menu.action:
@@ -138,20 +120,12 @@ class ir_ui_menu(osv.osv):
if not menu.child_id:
# not displayed if there is no children
continue
if not menu.parent_id.id:
# #For List view display,this list keeps the track of parents
self._parents.append(menu.id)
result.append(menu.id)
self._cache[key] = True
self._cache[key] = True
if count:
return len(result)
if limit:
result = result[:int(limit)]
return result
def _get_full_name(self, cr, uid, ids, name, args, context):