From 16aa30186e85dc693a88860fea028bf1ff9cce04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 7 Apr 2008 16:53:34 +0000 Subject: [PATCH] don't check item_list for non item fields git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@20328 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../portal_skins/erp5_odt_style/form_view.xml | 9 +++------ bt5/erp5_odt_style/bt/revision | 2 +- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml index 56380311e8..b8ea374fdc 100644 --- a/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml +++ b/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml @@ -264,11 +264,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> </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\'\n - tal:content="python:str(value)"\n - tal:condition="not:item_list" />\n - <text:p text:style-name=\'field-content\'\n - tal:content="python: field.render_pdf(value)"\n - tal:condition="item_list" />\n + tal:content="python: field.render_pdf(value)"/>\n </tal:block>\n <tal:block tal:condition="python: value is None">\n <text:p text:style-name=\'field-content\' tal:content="python: \' \'" />\n @@ -429,7 +425,8 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> </tal:block>\n </office:text>\n </office:body>\n -</office:document-content> +</office:document-content>\n + ]]></string> </value> </item> diff --git a/bt5/erp5_odt_style/bt/revision b/bt5/erp5_odt_style/bt/revision index c24b6ae77d..86ee83a4a2 100644 --- a/bt5/erp5_odt_style/bt/revision +++ b/bt5/erp5_odt_style/bt/revision @@ -1 +1 @@ -38 \ No newline at end of file +40 \ No newline at end of file -- 2.30.9