[Erp5-report] r17258 - in /erp5/trunk/bt5/erp5_odt_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Oct 29 17:53:55 2007
New Revision: 17258

URL: http://svn.erp5.org?rev=17258&view=rev
Log:
Also handle items if value is not a list. This is for ListField support

Modified:
    erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml
    erp5/trunk/bt5/erp5_odt_style/bt/revision

Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml?rev=17258&r1=17257&r2=17258&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml Mon Oct 29 17:53:55 2007
@@ -245,11 +245,12 @@
                            <table:table-cell table:style-name=\'field-table.B1\' office:value-type=\'string\'\n
                                              tal:define="value python: field.get_value(\'default\')">\n
                             <tal:block tal:condition="python: same_type(value,[]) or same_type(value,())">\n
-                              <tal:block tal:condition="python: field.has_value(\'items\')"\n
-                                         tal:define="field_item_dict python:dict([(x[1], x[0]) for x in field.get_value(\'items\')]);">\n
-                               <tal:block tal:repeat="item value">\n
-                                 <text:p text:style-name=\'field-content\'\n
+                              <tal:block tal:condition="python: field.has_value(\'items\')">\n
+                                <tal:block tal:define="field_item_dict python:dict([(x[1], x[0]) for x in field.get_value(\'items\')]);">\n
+                                 <tal:block tal:repeat="item value">\n
+                                   <text:p text:style-name=\'field-content\'\n
                                          tal:content="python: field_item_dict.get(item, \'??? (%s)\' % item)"/>\n
+                                 </tal:block>\n
                                </tal:block>\n
                               </tal:block>\n
                               <tal:block tal:condition="python: not field.has_value(\'items\')">\n
@@ -259,9 +260,16 @@
                                </tal:block>\n
                               </tal:block>\n
                            </tal:block>\n
-                            <tal:block tal:condition="python: not (same_type(value, []) or same_type(value, ()))">\n
-                              <text:p text:style-name=\'field-content\' tal:content="python: field.render_pdf(value)" />\n
-                            </tal:block>\n
+                           <tal:block tal:condition="python: not (same_type(value, []) or same_type(value, ()))">\n
+                             <tal:block tal:condition="python: field.has_value(\'items\')">\n
+                               <tal:block tal:define="field_item_dict python:dict([(x[1], x[0]) for x in field.get_value(\'items\')]);">                             \n
+                                 <text:p text:style-name=\'field-content\' tal:content="python: field_item_dict.get(value, \'??? (%s)\' % value)"/>\n
+                               </tal:block>\n
+                             </tal:block>\n
+                             <tal:block tal:condition="python: not field.has_value(\'items\')">\n
+                               <text:p text:style-name=\'field-content\' tal:content="python: field.render_pdf(value)" />\n
+                             </tal:block>\n
+                           </tal:block>\n
                            </table:table-cell>\n
                           </table:table-row>\n
                          </tal:block>\n

Modified: erp5/trunk/bt5/erp5_odt_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/revision?rev=17258&r1=17257&r2=17258&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_odt_style/bt/revision Mon Oct 29 17:53:55 2007
@@ -1,1 +1,1 @@
-14
+15