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 0ee9ee0419baf6822f1677a24987490c3d93499b..da11ec368f64a10bcf83a1c5676969e86db3493b 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 @@ -72,12 +72,6 @@ AAAAAFBpY3R1cmVzLzEwMDAwMDAwMDAwMDAwQjQwMDAwMDAyMTEyMkRCMEFELmpwZ1BLAQIUABQA AAAIAPCOATeB4XqibAEAABQIAAAVAAAAAAAAAAAAAAAAAOgKAABNRVRBLUlORi9tYW5pZmVzdC54 bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> </item> - <item> - <key> <string>__ac_local_roles__</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_bind_names</string> </key> <value> @@ -104,12 +98,6 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> </object> </value> </item> - <item> - <key> <string>_owner</string> </key> - <value> - <none/> - </value> - </item> <item> <key> <string>_text</string> </key> <value> <string encoding="cdata"><![CDATA[ @@ -392,8 +380,17 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> </tal:block>\n </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:block tal:condition="python: field_type==\'EditorField\' and field.get_value(\'text_editor\')==\'fck_editor\'">\n + <tal:block tal:content="structure python: field.render_pdf(value)" />\n + </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;\').replace(\'>\', \'&gt;\').replace(\'<\', \'&lt;\').replace(\'\\n\', \'<text:line-break/>\')"/>\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;\').replace(\'>\', \'&gt;\').replace(\'<\', \'&lt;\').replace(\'\\n\', \'<text:line-break/>\')"/>\n + </tal:block>\n </tal:block>\n <tal:block tal:condition="python: value is None">\n <text:p text:style-name=\'field-content\' tal:content="python: \' \'" />\n diff --git a/bt5/erp5_odt_style/bt/revision b/bt5/erp5_odt_style/bt/revision index fc9afb48e033d9a7d2a778e81ae0e9424950c1cd..2b82dfea308730c4f925388dbb683e6eae360640 100644 --- a/bt5/erp5_odt_style/bt/revision +++ b/bt5/erp5_odt_style/bt/revision @@ -1 +1 @@ -59 \ No newline at end of file +60 \ No newline at end of file