Merge lp:~unifield-team/unifield-web/web-uf_848 into lp:unifield-web

[jftempo]

Unmerged revisions

4603. By Quentin THEURET @Amaris on 2012-02-23

UF-848 [IMP] New version of patch

4602. By Quentin THEURET @Amaris on 2012-02-23

[REVERT] Revert modification in controllers/actions.py
UF-848 [IMP] Add a template for fields.text in listgrid to process it differently than fields.char

4601. By Quentin THEURET @Amaris on 2012-02-23

UF-848 [IMP] Try to display carriage returns and tabulation of fields.text in tree view

=== modified file 'addons/openerp/widgets/listgrid.py'
--- addons/openerp/widgets/listgrid.py	2012-02-20 09:55:45 +0000
+++ addons/openerp/widgets/listgrid.py	2012-03-16 13:19:37 +0000
@@ -517,6 +517,9 @@
     def __str__(self):
         return ustr(self.text)
 
+class Text(Char):
+    template = "/openerp/widgets/templates/listgrid/text.mako"
+
 class Reference(Char):
 
     def get_text(self):
@@ -744,6 +747,7 @@
 
 CELLTYPES = {
         'char':Char,
+        'text':Text,
         'many2one':M2O,
         'reference': Reference,
         'datetime':DateTime,
 
=== added file 'addons/openerp/widgets/templates/listgrid/text.mako'
--- addons/openerp/widgets/templates/listgrid/text.mako	1970-01-01 00:00:00 +0000
+++ addons/openerp/widgets/templates/listgrid/text.mako	2012-03-16 13:19:37 +0000
@@ -0,0 +1,31 @@
+<%!
+    def text_escape(text):
+        p_res = ''
+        p_text = text.split('\n')
+        for line in p_text:
+            p_res += '<p>%s</p>' % line
+
+        t_res = ''
+        t_margin = 0
+        t_text = p_res.split('\t')
+        for tab in t_text:
+            if not tab:
+                t_margin += 10
+            else:
+                t_res += '<span style="margin-left:%spx">%s</span>' % (t_margin, tab)
+                t_margin = 10
+
+        s_res = ''
+        s_text = t_res.split('  ')
+        s_margin = 0
+        for s in s_text:
+            if not s:
+                s_margin += 5
+            else:
+                s_res += '<span style="margin-left:%spx">%s</span>' % (s_margin, s)
+                s_margin = 5
+
+        return s_res or text
+%>
+
+<span name="${name}" value="${value}">${text | text_escape}</span>