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

[Merge] with: lp:~openerp-dev/openobject-server/trunk-sloppy-rng-jam

Browse Source 
bzr revid: tch@tinyerp.com-20120808093928-xgsth2ctjmeanqxm
This commit is contained in:
Twinkle Christian (OpenERP)
2012-08-08 15:09:28 +05:30
parent c9e13d09b1 803e74458e
commit c2a720105f
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
openerp/addons/base/ir/ir_ui_view.py
+7
View File
@@ -52,6 +52,13 @@ class view(osv.osv):
def _type_field(self, cr, uid, ids, name, args, context=None):
records = self.browse(cr, uid, ids, context)
result = dict((r.id, etree.fromstring(r.arch.encode('utf8')).tag) for r in records)
#NOTE: If we have inherited view the arch.tag will give us data and
# View mode will be undefined in case in hereit view we have view
# broken, Here for view which are inherited setting the parent view
# type.
for record in records:
if record.inherit_id:
result[record.id] = record.inherit_id.type
return result
_columns = {
openerp/tests/test_view_validation.py
+4 -23
View File
@@ -33,8 +33,9 @@ invalid_form = etree.parse(StringIO('''\
valid_form = etree.parse(StringIO('''\
<form string="">
<field name=""></field>
<field name=""></field>
<notebook>
<label for=""></label>
<page>
<field name=""></field>
<label string=""></label>
@@ -109,19 +110,11 @@ class test_view_validation(unittest2.TestCase):
assert not valid_att_in_form(invalid_form)
assert valid_att_in_form(valid_form)
def test_graph_field_validation(self):
def test_graph_validation(self):
assert not valid_field_in_graph(invalid_graph)
assert valid_field_in_graph(valid_graph)
def test_graph_string_validation(self):
assert not valid_field_in_graph(invalid_graph)
assert valid_field_in_graph(valid_graph)
def test_tree_field_validation(self):
assert not valid_field_in_tree(invalid_tree)
assert valid_field_in_tree(valid_tree)
def test_tree_string_validation(self):
def test_tree_validation(self):
assert not valid_field_in_tree(invalid_tree)
assert valid_field_in_tree(valid_tree)
@@ -133,18 +126,6 @@ class test_view_validation(unittest2.TestCase):
assert not valid_type_in_col(invalid_form)
assert valid_type_in_col(valid_form)
def test_form_view(self):
assert not valid_view(invalid_form)
assert valid_view(valid_form)
def test_tree_view(self):
assert not valid_view(invalid_tree)
assert valid_view(valid_tree)
def test_graph_view(self):
assert not valid_view(invalid_graph)
assert valid_view(valid_graph)
if __name__ == '__main__':
unittest2.main()