Also handle items if value is not a list. This is for ListField support

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17258 20353a03-c40f-0410-a6d1-a30d3c3de9de

bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/report_view.xml

@@ -245,13 +245,14 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
                            <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: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
                               <!-- XXX render_odf for list fields ? using TAL structure ? -->\n
                                <tal:block tal:repeat="item value">\n
@@ -260,8 +261,15 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
                               </tal:block>\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

bt5/erp5_odt_style/bt/revision

-14
+15
\ No newline at end of file

bt5/erp5_pdf_style/SkinTemplateItem/portal_skins/erp5_pdf_style/report_view.xml

@@ -85,13 +85,14 @@
                   </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: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: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
                            <para style="TableStandard"\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
                         <tal:block tal:repeat="item value">\n
                           <para  style="TableStandard" tal:content="python: str(item)" />\n
@@ -99,8 +100,18 @@
                       </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
+                     <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
+                        <!-- field.render_pdf should do this. Also the check field.has_value is wrong with RelationFields.\n
+                             Fortunatly we don\'t use them in reports for now --> \n
+                         <para style="TableStandard"\n
+                               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
                         <para  style="TableStandard" tal:content="python: field.render_pdf(value)" />\n
                       </tal:block>\n
+                    </tal:block>\n
                     <tal:block tal:condition="python: value is None">\n
                       <para  style="TableStandard" tal:content="python: \' \'" />\n
                     </tal:block>\n

bt5/erp5_pdf_style/bt/revision

-50
+51
\ No newline at end of file