projects
/
odoo
/
odoo.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a2fb618
)
[IMP] website: make code more robust
author
Raphael Collet
<rco@openerp.com>
Mon, 27 Jan 2014 14:58:48 +0000
(15:58 +0100)
committer
Raphael Collet
<rco@openerp.com>
Mon, 27 Jan 2014 14:58:48 +0000
(15:58 +0100)
bzr revid: rco@openerp.com-
20140127145848
-ib7jlhb1c6aw3w2d
addons/website/models/ir_ui_view.py
patch
|
blob
|
history
diff --git
a/addons/website/models/ir_ui_view.py
b/addons/website/models/ir_ui_view.py
index
ad6e98d
..
303691b
100644
(file)
--- a/
addons/website/models/ir_ui_view.py
+++ b/
addons/website/models/ir_ui_view.py
@@
-28,14
+28,15
@@
class view(osv.osv):
stack_result = []
def view_obj(view):
- if type(view) in (str, unicode):
+ if isinstance(view, basestring):
mod_obj = self.pool.get("ir.model.data")
m, n = view.split('.')
_, view = mod_obj.get_object_reference(cr, uid, m, n)
- if type(view) == int:
+ elif isinstance(view, (int, long)):
view_obj = self.pool.get("ir.ui.view")
view = view_obj.browse(cr, uid, view, context=context)
return view
+
try:
view = view_obj(view)
except ValueError: