[Erp5-report] r31679 ivan - in /erp5/trunk/bt5/erp5_odt_style: SkinTemplateItem/portal_skin...

[nobody at svn.erp5.org]

Author: ivan
Date: Mon Jan 11 15:22:46 2010
New Revision: 31679

URL: http://svn.erp5.org?rev=31679&view=rev
Log:
Do not try to include image tags if image default field value is an empty string (i.e. not set).
This fails physicalPathFromURL.

Modified:
    erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
    erp5/trunk/bt5/erp5_odt_style/bt/revision

Modified: erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml?rev=31679&r1=31678&r2=31679&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_odt_style/SkinTemplateItem/portal_skins/erp5_odt_style/form_view.xml [utf8] Mon Jan 11 15:22:46 2010
@@ -259,10 +259,11 @@
                           <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\')), 100);\n
-                                    width python:(preferred_width  / 20.) &lt; max_size and (preferred_width / 20.) or max_size">\n
-                              <tal:block>\n
+                                    width python:(preferred_width  / 20.) &lt; max_size and (preferred_width / 20.) or max_size;\n
+                                    field_value python: field.get_value(\'default\')">\n
+                              <tal:block tal:condition="python: field_value not in (\'\', None,)">\n
                                 <office:include_img tal:attributes="width width;\n
-                                path python: \'/\'.join(request.physicalPathFromURL(field.get_value(\'default\')));"\n
+                                path python: \'/\'.join(request.physicalPathFromURL(field_value));"\n
                                 style="inline-graphic"/>\n
                               </tal:block>\n
                             </text:p>\n

Modified: erp5/trunk/bt5/erp5_odt_style/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_odt_style/bt/revision?rev=31679&r1=31678&r2=31679&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_odt_style/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_odt_style/bt/revision [utf8] Mon Jan 11 15:22:46 2010
@@ -1,1 +1,1 @@
-80
+83