[Erp5-report] r23745 - /erp5/trunk/products/ERP5Form/OOoChart.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Sep 22 18:44:35 2008
New Revision: 23745

URL: http://svn.erp5.org?rev=23745&view=rev
Log:
don't use ERP5Site_getAbsoluteUrl but REQUEST['BASEPATH1'], it's what's used by
zope to include icons from misc_, and it works under apache RewriteRule


Modified:
    erp5/trunk/products/ERP5Form/OOoChart.py

Modified: erp5/trunk/products/ERP5Form/OOoChart.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/OOoChart.py?rev=23745&r1=23744&r2=23745&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/OOoChart.py (original)
+++ erp5/trunk/products/ERP5Form/OOoChart.py Mon Sep 22 18:44:35 2008
@@ -422,8 +422,6 @@
     here = getattr(form, 'aq_parent', REQUEST)
     # Update the render format based on REQUEST parameters
     render_format = getattr(REQUEST, 'render_format', render_format)
-    UrlIconOOo='%s/misc_/ERP5OOo/OOo.png' % here.ERP5Site_getAbsoluteUrl()
-    UrlIconPdf='%s/misc_/ERP5Form/PDF.png' % here.ERP5Site_getAbsoluteUrl()
     if render_format == 'html':
       field_absolute_url = '%s/%s/%s' % (here.absolute_url(),
                                          form.getId(),
@@ -442,6 +440,7 @@
                        alt)
         return main_content
       elif format == 'raw':
+        UrlIconOOo = '%s/misc_/ERP5OOo/OOo.png' % REQUEST['BASEPATH1']
         main_content = '''<div class="OOoChartContent">
           <a href="%s?render_format=&display=%s"><img src="%s" alt="OOo"/></a></div>
           ''' % (field_absolute_url,
@@ -449,6 +448,7 @@
                  UrlIconOOo)
         return main_content
       elif format == 'pdf':
+        UrlIconPdf = '%s/misc_/ERP5Form/PDF.png' % REQUEST['BASEPATH1']
         main_content = '''<div class="OOoChartContent">
           <a href="%s?render_format=pdf&display=%s"><img src="%s" alt="PDF" /></a>
           </div>''' % (field_absolute_url,