odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] Customize menu 

bzr revid: fp@tinyerp.com-20140130194227-b5brj96f8tgc88hf
This commit is contained in:
Fabien Pinckaers 2014-01-30 20:42:27 +01:00
parent f85065930e
commit a1b95f6823
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/website/controllers/main.py
View File

@ -168,7 +168,7 @@ class Website(openerp.addons.web.controllers.main.Home):
group_ids = [g.id for g in user.groups_id]
view = request.registry.get("ir.ui.view")
views = view._views_get(request.cr, request.uid, xml_id, request.context)
views = view._views_get(request.cr, request.uid, xml_id, context=request.context)
done = {}
result = []
for v in views:

18
addons/website/models/ir_ui_view.py
View File

@ -46,6 +46,16 @@ class view(osv.osv):
view = view.inherit_id
result = [view]
node = etree.fromstring(view.arch)
for child in node.xpath("//t[@t-call]"):
try:
call_view = view_obj(child.get('t-call'))
except ValueError:
continue
if call_view not in result:
result += self._views_get(cr, uid, call_view, options=options, context=context, stack_result=result)
todo = view.inherit_children_ids
if options:
todo += filter(lambda x: not x.inherit_id, view.inherited_option_ids)
@ -55,14 +65,6 @@ class view(osv.osv):
for r in self._views_get(cr, uid, child_view, options=bool(child_view.inherit_id), context=context, root=False, stack_result=result):
if r not in result:
result.append(r)
node = etree.fromstring(view.arch)
for child in node.xpath("//t[@t-call]"):
try:
call_view = view_obj(child.get('t-call'))
except ValueError:
continue
if call_view not in result:
result += self._views_get(cr, uid, call_view, options=options, context=context, stack_result=result)
return result
def extract_embedded_fields(self, cr, uid, arch, context=None):