NaNtic
/
trytond-patches
mirror of https://github.com/NaN-tic/trytond-patches.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Adapted issue10071002_1 to lasts commits in trytond

This commit is contained in:
Guillem Barba 2016-01-05 11:52:20 +01:00
parent a1b3226678
commit bc2a1d2ceb
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
issue10071002_1.diff
View File

@ -10,22 +10,23 @@ Index: trytond/trytond/model/modelview.py
--- a/trytond/trytond/model/modelview.py
+++ b/trytond/trytond/model/modelview.py
@@ -399,14 +399,15 @@
@@ -399,15 +399,16 @@
# Remove field without read access
for field in fields_to_remove:
for element in tree.xpath(
for i, element in enumerate(tree.xpath(
- '//field[@name="%s"] | //label[@name="%s"]'
- % (field, field)):
- % (field, field))):
- if type == 'form':
+ ('//field[@name="%s"] | //label[@name="%s"]'
+ ' | //page[@name="%s"] | //separator[@name="%s"]'
+ ' | //group[@name="%s"]') % ((field,) * 5)):
+ ' | //group[@name="%s"]') % ((field,) * 5))):
+ if type == 'tree' or element.tag in ('page', 'group'):
+ parent = element.getparent()
+ parent.remove(element)
+ elif type == 'form':
element.tag = 'label'
element.attrib.clear()
element.attrib['id'] = 'hidden %s-%s' % (field, i)
- elif type == 'tree':
- parent = element.getparent()
- parent.remove(element)