From e7881c5a85cb7512fa8fab9077c27934a637e97d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Tue, 10 Jun 2008 11:28:52 +0000 Subject: [PATCH] provide a default value when no preference is active (this is to fix unit test failure) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@21457 20353a03-c40f-0410-a6d1-a30d3c3de9de --- .../SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml | 2 +- bt5/erp5_odt_style/bt/revision | 2 +- 2 files changed, 2 insertions(+), 2 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 c40fd5caac..6d0b4fbd09 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 @@ -269,7 +269,7 @@ bWxQSwUGAAAAAAIAAgCeAAAAhwwAAAAA</string> </value> <tal:block tal:define="global max_size python:9;"/>\n <tal:block tal:condition="python: field_type == \'ImageField\'">\n <text:p text:style-name=\'field-content\'\n - tal:define="preferred_width python: preference_tool.getPreference(\'preferred_%s_image_width\' % (field.get_value(\'image_display\')));\n + tal:define="preferred_width python: preference_tool.getPreference(\'preferred_%s_image_width\' % (field.get_value(\'image_display\')), 100);\n width python:(preferred_width / 20.) < max_size and (preferred_width / 20.) or max_size">\n <tal:block>\n <office:include_img tal:attributes="width width;\n diff --git a/bt5/erp5_odt_style/bt/revision b/bt5/erp5_odt_style/bt/revision index c5b431b6cb..7003e7fe1f 100644 --- a/bt5/erp5_odt_style/bt/revision +++ b/bt5/erp5_odt_style/bt/revision @@ -1 +1 @@ -50 \ No newline at end of file +51 \ No newline at end of file -- 2.30.9