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

[nobody at svn.erp5.org]

Author: yusei
Date: Fri Oct 24 15:19:13 2008
New Revision: 24315

URL: http://svn.erp5.org?rev=24315&view=rev
Log:
2008-10-24 yusei
* Convert return value of render_pdf to string explicitly. It might return non-string value.

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

Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml?rev=24315&r1=24314&r2=24315&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml Fri Oct 24 15:19:13 2008
@@ -242,7 +242,7 @@
                           <tal:block tal:condition="python: field_type not in (\'ImageField\',\'OOoChart\' )">\n
                             <text:p tal:condition="python: not(same_type(value,[]) or same_type(value,()))"\n
                                     text:style-name=\'field-content\'\n
-                                    tal:content="structure python: field.render_pdf(value).replace(\'&amp;\', \'&amp;amp;\').replace(\'&gt;\', \'&amp;gt;\').replace(\'&lt;\', \'&amp;lt;\').replace(\'\\n\', \'&lt;text:line-break/&gt;\')"/>\n
+                                    tal:content="structure python:str(field.render_pdf(value)).replace(\'&amp;\', \'&amp;amp;\').replace(\'&gt;\', \'&amp;gt;\').replace(\'&lt;\', \'&amp;lt;\').replace(\'\\n\', \'&lt;text:line-break/&gt;\')"/>\n
                             <tal:block tal:condition="python:same_type(value,[]) or same_type(value,())"\n
                                         tal:repeat="item value">\n
                               <text:p text:style-name=\'field-content\'\n
@@ -385,11 +385,11 @@
                     </tal:block>\n
                     <tal:block tal:condition="python: field_type in (\'EditorField\',) and field.get_value(\'text_editor\')==\'text_area\'">\n
                       <text:p text:style-name=\'field-content-center\'\n
-                  tal:content="structure python: field.render_pdf(value).replace(\'&amp;\', \'&amp;amp;\').replace(\'&gt;\', \'&amp;gt;\').replace(\'&lt;\', \'&amp;lt;\').replace(\'\\n\', \'&lt;text:line-break/&gt;\')"/>\n
+                  tal:content="structure python: str(field.render_pdf(value)).replace(\'&amp;\', \'&amp;amp;\').replace(\'&gt;\', \'&amp;gt;\').replace(\'&lt;\', \'&amp;lt;\').replace(\'\\n\', \'&lt;text:line-break/&gt;\')"/>\n
                     </tal:block>\n
                     <tal:block tal:condition="python: field_type!=\'EditorField\'">\n
                       <text:p text:style-name=\'field-content-center\'\n
-                              tal:content="structure python: field.render_pdf(value).replace(\'&amp;\', \'&amp;amp;\').replace(\'&gt;\', \'&amp;gt;\').replace(\'&lt;\', \'&amp;lt;\').replace(\'\\n\', \'&lt;text:line-break/&gt;\')"/>\n
+                              tal:content="structure python: str(field.render_pdf(value)).replace(\'&amp;\', \'&amp;amp;\').replace(\'&gt;\', \'&amp;gt;\').replace(\'&lt;\', \'&amp;lt;\').replace(\'\\n\', \'&lt;text:line-break/&gt;\')"/>\n
                     </tal:block>\n
                   </tal:block>\n
                   <tal:block tal:condition="python: value is None">\n

Modified: erp5/trunk/bt5/erp5_odt_style/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/change_log?rev=24315&r1=24314&r2=24315&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/bt/change_log (original)
+++ erp5/trunk/bt5/erp5_odt_style/bt/change_log Fri Oct 24 15:19:13 2008
@@ -1,3 +1,6 @@
+2008-10-24 yusei
+* Convert return value of render_pdf to string explicitly. It might return non-string value.
+
 2008-10-14 yusei
 * Start to develop version 5.3.
 
@@ -21,4 +24,4 @@
 Add macros for deferred rendering in report_view
 
 2007-08-24 Ibou NDIAYE
-Initial revision
+Initial revision

Modified: erp5/trunk/bt5/erp5_odt_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/revision?rev=24315&r1=24314&r2=24315&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/bt/revision (original)
+++ erp5/trunk/bt5/erp5_odt_style/bt/revision Fri Oct 24 15:19:13 2008
@@ -1,1 +1,1 @@
-62
+63