[Erp5-report] r17256 - in /erp5/trunk/bt5/erp5_pdf_style: SkinTemplateItem/portal_skins/erp...

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Oct 29 17:22:07 2007
New Revision: 17256

URL: http://svn.erp5.org?rev=17256&view=rev
Log:
If we have a listfield, use it's "item" value ( see r17255 )

Added:
    erp5/trunk/bt5/erp5_pdf_style/bt/template_tool_id_list
Modified:
    erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml
    erp5/trunk/bt5/erp5_pdf_style/bt/revision

Modified: erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml?rev=17256&r1=17255&r2=17256&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml (original)
+++ erp5/trunk/bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml Mon Oct 29 17:22:07 2007
@@ -3,11 +3,8 @@
   <record id="1" aka="AAAAAAAAAAE=">
     <pickle>
       <tuple>
-        <tuple>
-          <string>Products.ERP5Form.PDFTemplate</string>
-          <string>PDFTemplate</string>
-        </tuple>
-        <none/>
+        <global name="PDFTemplate" module="Products.ERP5Form.PDFTemplate"/>
+        <tuple/>
       </tuple>
     </pickle>
     <pickle>
@@ -88,8 +85,17 @@
                   </td>\n
                   <td tal:attributes="colwidth python: None" 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:repeat="item value">\n
-                        <para  style="TableStandard" tal:content="python: str(item)" />\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
+                           <para style="TableStandard"\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
+                        <tal:block tal:repeat="item value">\n
+                          <para  style="TableStandard" tal:content="python: str(item)" />\n
+                        </tal:block>\n
                       </tal:block>\n
                     </tal:block>\n
                     <tal:block tal:condition="python: not (same_type(value, []) or same_type(value, ()) or same_type(value, None))">\n

Modified: erp5/trunk/bt5/erp5_pdf_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdf_style/bt/revision?rev=17256&r1=17255&r2=17256&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_pdf_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_pdf_style/bt/revision Mon Oct 29 17:22:07 2007
@@ -1,1 +1,1 @@
-49
+50

Added: erp5/trunk/bt5/erp5_pdf_style/bt/template_tool_id_list
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_pdf_style/bt/template_tool_id_list?rev=17256&view=auto
==============================================================================
    (empty)