[Erp5-report] r24316 - in /erp5/branches/version-5.2.1/bt5/erp5_odt_style: SkinTemplateItem...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Oct 24 15:39:16 CEST 2008
Author: yusei
Date: Fri Oct 24 15:39:13 2008
New Revision: 24316
URL: http://svn.erp5.org?rev=24316&view=rev
Log:
2008-10-24 yusei
* Backport bugfix. Convert return value of render_pdf to string explicitly. It might return non-string value.
Modified:
erp5/branches/version-5.2.1/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/change_log
erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/revision
erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/version
Modified: erp5/branches/version-5.2.1/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
URL: http://svn.erp5.org/erp5/branches/version-5.2.1/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml?rev=24316&r1=24315&r2=24316&view=diff
==============================================================================
--- erp5/branches/version-5.2.1/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml (original)
+++ erp5/branches/version-5.2.1/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml Fri Oct 24 15:39:13 2008
@@ -73,12 +73,6 @@
bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
</item>
<item>
- <key> <string>__ac_local_roles__</string> </key>
- <value>
- <none/>
- </value>
- </item>
- <item>
<key> <string>_bind_names</string> </key>
<value>
<object>
@@ -102,12 +96,6 @@
</dictionary>
</state>
</object>
- </value>
- </item>
- <item>
- <key> <string>_owner</string> </key>
- <value>
- <none/>
</value>
</item>
<item>
@@ -254,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;\').replace(\'>\', \'&gt;\').replace(\'<\', \'&lt;\').replace(\'\\n\', \'<text:line-break/>\')"/>\n
+ tal:content="structure python: str(field.render_pdf(value)).replace(\'&\', \'&amp;\').replace(\'>\', \'&gt;\').replace(\'<\', \'&lt;\').replace(\'\\n\', \'<text:line-break/>\')"/>\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
@@ -393,7 +381,7 @@
</tal:block>\n
<tal:block tal:condition="python: (not (same_type(value,[]) or same_type(value,()) )) and (value != None)">\n
<text:p text:style-name=\'field-content-center\'\n
- tal:content="structure python: field.render_pdf(value).replace(\'&\', \'&amp;\').replace(\'>\', \'&gt;\').replace(\'<\', \'&lt;\').replace(\'\\n\', \'<text:line-break/>\')"/>\n
+ tal:content="structure python: str(field.render_pdf(value)).replace(\'&\', \'&amp;\').replace(\'>\', \'&gt;\').replace(\'<\', \'&lt;\').replace(\'\\n\', \'<text:line-break/>\')"/>\n
</tal:block>\n
<tal:block tal:condition="python: value is None">\n
<text:p text:style-name=\'field-content\' tal:content="python: \' \'" />\n
Modified: erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/change_log
URL: http://svn.erp5.org/erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/change_log?rev=24316&r1=24315&r2=24316&view=diff
==============================================================================
--- erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/change_log (original)
+++ erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/change_log Fri Oct 24 15:39:13 2008
@@ -1,3 +1,6 @@
+2008-10-24 yusei
+* Backport bugfix. Convert return value of render_pdf to string explicitly. It might return non-string value.
+
2008-06-27 yusei
* Start to develop version 5.2.
@@ -18,4 +21,4 @@
Add macros for deferred rendering in report_view
2007-08-24 Ibou NDIAYE
-Initial revision
+Initial revision
Modified: erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/revision
URL: http://svn.erp5.org/erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/revision?rev=24316&r1=24315&r2=24316&view=diff
==============================================================================
--- erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/revision (original)
+++ erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/revision Fri Oct 24 15:39:13 2008
@@ -1,1 +1,1 @@
-58
+60
Modified: erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/version
URL: http://svn.erp5.org/erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/version?rev=24316&r1=24315&r2=24316&view=diff
==============================================================================
--- erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/version (original)
+++ erp5/branches/version-5.2.1/bt5/erp5_odt_style/bt/version Fri Oct 24 15:39:13 2008
@@ -1,1 +1,1 @@
-5.2
+5.2.1
More information about the Erp5-report
mailing list