Merge lp:~openerp-dev/openobject-server/server-6.0-training-bugfixes into lp:openobject-server/6.0

[Olivier Laurent (Open ERP)]

[FIX] allow inheriting and/or changing style per row inside <blockTable/>
[IMP] Add the link xml attribute in the Relax NG file (used in web client)
[FIX] IndexError for empty 's' parm in res.lang _group() function

[Vo Minh Thu (thu)]

Hi,

The tuple->list conversion seems a bit fragile. Unless there is a compelling reason to do so, this will not be accepted. Anyway, a separate merge proposal would be needed.

The link attribute on the field element is a fragile, unsupported feature. Also, it gives only a false sense of security.

The IndexError will be corrected on its own.

Still, thanks for the merge proposal.

review: Disapprove

Unmerged revisions

3415. By Olivier Laurent (Open ERP) on 2011-04-27

[FIX] allow inheriting and/or changing style per row inside <blockTable/>

Normally you can to something like this:

<blockTable ... style="terp_style_1">
  <tr ... style="terp_style_2">
    <td></td>
    <td></td>
  </tr>
  <tr ... style="terp_style_2_colspan2">
    <td></td>
  </tr>
</blockTable>

This is permitted by the system and is implemented, BUT actually the table
style inheriting is using tuple() and this avoid any style modification.

The patch simply change tuple() to list() without any futher modification,
to permit a more flexible table style inheriting. (colspan, ...)

3414. By Olivier Laurent (Open ERP) on 2011-04-27

[IMP] Add the link xml attribute in the Relax NG file

3413. By Olivier Laurent (Open ERP) on 2011-04-27

[FIX] IndexError for empty 's' parm in res.lang _group() function

=== modified file 'bin/addons/base/res/res_lang.py'
--- bin/addons/base/res/res_lang.py	2011-01-12 16:06:08 +0000
+++ bin/addons/base/res/res_lang.py	2011-04-27 11:33:56 +0000
@@ -191,7 +191,7 @@
         seps = 0
         spaces = ""
 
-        if s[-1] == ' ':
+        if s and s[-1] == ' ':
             sp = s.find(' ')
             spaces = s[sp:]
             s = s[:sp]
 
=== modified file 'bin/addons/base/rng/view.rng'
--- bin/addons/base/rng/view.rng	2010-12-27 10:41:55 +0000
+++ bin/addons/base/rng/view.rng	2011-04-27 11:33:56 +0000
@@ -413,6 +413,7 @@
             <rng:ref name="overload"/>
             <rng:ref name="access_rights"/>
             <rng:optional><rng:attribute name="editable"/></rng:optional>
+            <rng:optional><rng:attribute name="link"/></rng:optional>
             <rng:optional><rng:attribute name="domain_filter"/></rng:optional>
             <rng:optional><rng:attribute name="attrs"/></rng:optional>
             <rng:optional><rng:attribute name="string"/></rng:optional>
 
=== modified file 'bin/import_xml.rng'
--- bin/import_xml.rng	2010-11-27 03:03:04 +0000
+++ bin/import_xml.rng	2011-04-27 11:33:56 +0000
@@ -128,6 +128,7 @@
             <rng:optional><rng:attribute name="search"/></rng:optional>
             <rng:optional><rng:attribute name="model"/></rng:optional>
             <rng:optional><rng:attribute name="use"/></rng:optional>
+            <rng:optional><rng:attribute name="link"/></rng:optional>
             <rng:oneOrMore>
                 <rng:choice>
                     <rng:ref name="any"/>
 
=== modified file 'bin/report/render/rml2pdf/trml2pdf.py'
--- bin/report/render/rml2pdf/trml2pdf.py	2011-01-04 10:13:35 +0000
+++ bin/report/render/rml2pdf/trml2pdf.py	2011-04-27 11:33:56 +0000
@@ -172,32 +172,32 @@
     def _table_style_get(self, style_node):
         styles = []
         for node in style_node:
-            start = utils.tuple_int_get(node, 'start', (0,0) )
-            stop = utils.tuple_int_get(node, 'stop', (-1,-1) )
+            start = utils.tuple_int_get(node, 'start', [0,0] )
+            stop = utils.tuple_int_get(node, 'stop', [-1,-1] )
             if node.tag=='blockValign':
-                styles.append(('VALIGN', start, stop, str(node.get('value'))))
+                styles.append(['VALIGN', start, stop, str(node.get('value'))])
             elif node.tag=='blockFont':
-                styles.append(('FONT', start, stop, str(node.get('name'))))
+                styles.append(['FONT', start, stop, str(node.get('name'))])
             elif node.tag=='blockTextColor':
-                styles.append(('TEXTCOLOR', start, stop, color.get(str(node.get('colorName')))))
+                styles.append(['TEXTCOLOR', start, stop, color.get(str(node.get('colorName')))])
             elif node.tag=='blockLeading':
-                styles.append(('LEADING', start, stop, utils.unit_get(node.get('length'))))
+                styles.append(['LEADING', start, stop, utils.unit_get(node.get('length'))])
             elif node.tag=='blockAlignment':
-                styles.append(('ALIGNMENT', start, stop, str(node.get('value'))))
+                styles.append(['ALIGNMENT', start, stop, str(node.get('value'))])
             elif node.tag=='blockSpan':
-                styles.append(('SPAN', start, stop))
+                styles.append(['SPAN', start, stop])
             elif node.tag=='blockLeftPadding':
-                styles.append(('LEFTPADDING', start, stop, utils.unit_get(node.get('length'))))
+                styles.append(['LEFTPADDING', start, stop, utils.unit_get(node.get('length'))])
             elif node.tag=='blockRightPadding':
-                styles.append(('RIGHTPADDING', start, stop, utils.unit_get(node.get('length'))))
+                styles.append(['RIGHTPADDING', start, stop, utils.unit_get(node.get('length'))])
             elif node.tag=='blockTopPadding':
-                styles.append(('TOPPADDING', start, stop, utils.unit_get(node.get('length'))))
+                styles.append(['TOPPADDING', start, stop, utils.unit_get(node.get('length'))])
             elif node.tag=='blockBottomPadding':
-                styles.append(('BOTTOMPADDING', start, stop, utils.unit_get(node.get('length'))))
+                styles.append(['BOTTOMPADDING', start, stop, utils.unit_get(node.get('length'))])
             elif node.tag=='blockBackground':
-                styles.append(('BACKGROUND', start, stop, color.get(node.get('colorName'))))
+                styles.append(['BACKGROUND', start, stop, color.get(node.get('colorName'))])
             if node.get('size'):
-                styles.append(('FONTSIZE', start, stop, utils.unit_get(node.get('size'))))
+                styles.append(['FONTSIZE', start, stop, utils.unit_get(node.get('size'))])
             elif node.tag=='lineStyle':
                 kind = node.get('kind')
                 kind_list = [ 'GRID', 'BOX', 'OUTLINE', 'INNERGRID', 'LINEBELOW', 'LINEABOVE','LINEBEFORE', 'LINEAFTER' ]
@@ -205,7 +205,7 @@
                 thick = 1
                 if node.get('thickness'):
                     thick = float(node.get('thickness'))
-                styles.append((kind, start, stop, thick, color.get(node.get('colorName'))))
+                styles.append([kind, start, stop, thick, color.get(node.get('colorName'))])
         return platypus.tables.TableStyle(styles)
 
     def para_style_get(self, node):