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

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Oct 29 17:13:24 2007
New Revision: 17255

URL: http://svn.erp5.org?rev=17255&view=rev
Log:
Support fields defining items for list values

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=17255&r1=17254&r2=17255&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:13:24 2007
@@ -242,12 +242,22 @@
                            <table:table-cell table:style-name=\'field-table.A1\' office:value-type=\'string\'>\n
                             <text:p text:style-name=\'field-label\' tal:content="python: here.Localizer.erp5_ui.gettext(field.get_value(\'title\')).encode(\'utf-8\')" />\n
                            </table:table-cell>\n
-                           <table:table-cell table:style-name=\'field-table.B1\' office:value-type=\'string\' tal:define="value python: field.get_value(\'default\')">\n
+                           <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
-                            <!-- XXX render_odf for list fields ? using TAL structure ? -->\n
-                             <tal:block tal:repeat="item value">\n
-                               <text:p text:style-name=\'field-content\' tal:content="item" />\n
-                             </tal:block>\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:content="python: field_item_dict.get(item, \'??? (%s)\' % item)"/>\n
+                               </tal:block>\n
+                              </tal:block>\n
+                              <tal:block tal:condition="python: not field.has_value(\'items\')">\n
+                              <!-- XXX render_odf for list fields ? using TAL structure ? -->\n
+                               <tal:block tal:repeat="item value">\n
+                                 <text:p text:style-name=\'field-content\' tal:content="item" />\n
+                               </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

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