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

[IMP] deduplicate code in handling of relational fields for exports listing 

bzr revid: xmo@openerp.com-20110831123401-o9rsbu4p9vux0ywf
This commit is contained in:
Xavier Morel 2011-08-31 14:34:01 +02:00
parent 5be7b90758
commit 1ca1f7ff0a
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
addons/base/controllers/main.py
View File

@ -1114,29 +1114,14 @@ class Export(View):
records.append(record)
if len(nm.split('/')) < 3 and 'relation' in field:
if import_compat:
ref = field.pop('relation')
cfields = self.fields_get(req, ref)
ref = field.pop('relation')
record['params'] = {'model': ref, 'prefix': id, 'name': nm}
if import_compat and field['type'] in ('many2one', 'many2many'):
if field['type'] == 'many2many':
record['children'] = []
record['params'] = {'model': ref, 'prefix': id, 'name': nm}
elif field['type'] == 'many2one':
record['children'] = [id + '/id', id + '/.id']
record['params'] = {'model': ref, 'prefix': id, 'name': nm}
else:
cfields_order = cfields.keys()
cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', '')))
children = []
for fld in cfields_order:
cid = id + '/' + fld
cid = cid.replace(' ', '_')
children.append(cid)
record['children'] = children or []
record['params'] = {'model': ref, 'prefix': id, 'name': nm}
else:
ref = field.pop('relation')
cfields = self.fields_get(req, ref)
cfields_order = cfields.keys()
cfields_order.sort(lambda x,y: -cmp(cfields[x].get('string', ''), cfields[y].get('string', '')))
@ -1145,8 +1130,7 @@ class Export(View):
cid = id + '/' + fld
cid = cid.replace(' ', '_')
children.append(cid)
record['children'] = children or []
record['params'] = {'model': ref, 'prefix': id, 'name': nm}
record['children'] = children
records.reverse()
return records