Merge lp:~viktor-nagy/openobject-server/repeatInArgument3Fixed into lp:openobject-server

[ViktorNagy]

If someone uses the third argument of repeatIn in a report (e.g.: [[ repeatIn(sale_order_lines(o), 'l', '{http://openoffice.org/2000/text}section') ]] ), then the parser quotes it, even though it's already quoted.

These double quotes are eliminated in this branch.

[Vo Minh Thu (thu)]

Since you have already a similar merge proposal at https://code.launchpad.net/~toolpart/openobject-server/toolpart/+merge/68793, I will reject this one.

Unmerged revisions

3357. By ViktorNagy on 2011-05-26

fixed repeatIn with specified tag bug

=== modified file 'openerp/report/preprocess.py'
--- openerp/report/preprocess.py	2010-05-18 10:32:42 +0000
+++ openerp/report/preprocess.py	2011-05-27 07:44:33 +0000
@@ -66,10 +66,12 @@
                         match = html_parents
                     if txt.group(3):
                         match = [txt.group(3)]
-                    n = node
-                    while n.tag not in match:
-                        n = n.getparent()
-                    n.set('rml_loop', txt.group(2))
+                        if match[0].startswith("'"):
+                            match[0] = match[0][1:-1]
+                    n2= node
+                    while n2.tag not in match:
+                        n2 = n2.getparent()
+                    n2.set('rml_loop', txt.group(2))
                     return '[['+txt.group(1)+"''"+txt.group(4)+']]'
                 t = _regex1.sub(_sub1, node.text or node.tail)
                 if t == " ":