Commit 683627b3 authored by Yusei Tahara's avatar Yusei Tahara

2008-10-24 yusei

* Convert return value of render_pdf to string explicitly. It might return non-string value.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@24315 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent f6278cee
...@@ -242,7 +242,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -242,7 +242,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
<tal:block tal:condition="python: field_type not in (\'ImageField\',\'OOoChart\' )">\n <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:p tal:condition="python: not(same_type(value,[]) or same_type(value,()))"\n
text:style-name=\'field-content\'\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:block tal:condition="python:same_type(value,[]) or same_type(value,())"\n
tal:repeat="item value">\n tal:repeat="item value">\n
<text:p text:style-name=\'field-content\'\n <text:p text:style-name=\'field-content\'\n
...@@ -385,11 +385,11 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> ...@@ -385,11 +385,11 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value>
</tal:block>\n </tal:block>\n
<tal:block tal:condition="python: field_type in (\'EditorField\',) and field.get_value(\'text_editor\')==\'text_area\'">\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 <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: field_type!=\'EditorField\'">\n <tal:block tal:condition="python: field_type!=\'EditorField\'">\n
<text:p text:style-name=\'field-content-center\'\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>\n </tal:block>\n
<tal:block tal:condition="python: value is None">\n <tal:block tal:condition="python: value is None">\n
......
2008-10-24 yusei
* Convert return value of render_pdf to string explicitly. It might return non-string value.
2008-10-14 yusei 2008-10-14 yusei
* Start to develop version 5.3. * Start to develop version 5.3.
......
62 63
\ No newline at end of file \ No newline at end of file
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment