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

fix 

bzr revid: fp@tinyerp.com-20120610104338-spr8hfo74z2vy0nj
This commit is contained in:
Fabien Pinckaers 2012-06-10 12:43:38 +02:00
parent b1ab584317
commit 7d89afe7bc
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
openerp/addons/base/ir/ir_ui_view.py
View File

@ -124,9 +124,26 @@ class view(osv.osv):
:rtype: list of tuples
:return: [(view_arch,view_id), ...]
"""
cr.execute("""SELECT arch, id FROM ir_ui_view WHERE inherit_id=%s AND model=%s
ORDER BY priority""",
(view_id, model))
if self.pool._init:
cr.execute("""SELECT
arch, id
FROM
ir_ui_view
WHERE
inherit_id=%s AND model=%s
ORDER BY priority""", (view_id, model))
else:
cr.execute("""SELECT
v.arch, v.id
FROM
ir_ui_view v
LEFT JOIN
ir_model_data d ON (d.res_id=v.id AND d.model='ir.ui.view')
LEFT JOIN
ir_module_module m ON (m.state='installed' AND m.name=d.module)
WHERE
inherit_id=%s AND model=%s
ORDER BY priority""", (view_id, model))
return cr.fetchall()
def write(self, cr, uid, ids, vals, context=None):