[Erp5-report] r37800 nicolas - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTempla...

nobody at svn.erp5.org nobody at svn.erp5.org
Fri Aug 13 15:52:28 CEST 2010


Author: nicolas
Date: Fri Aug 13 15:52:26 2010
New Revision: 37800

URL: http://svn.erp5.org?rev=37800&view=rev
Log:
Always pass format parameter to force the download of content

Modified:
    erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml
    erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml?rev=37800&r1=37799&r2=37800&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/SkinTemplateItem/portal_skins/erp5_core/Base_download.xml [utf8] Fri Aug 13 15:52:26 2010
@@ -58,13 +58,14 @@ response = request.RESPONSE\n
 \n
 from zExceptions import Unauthorized\n
 \n
+format = None\n
 # Always force download of document even if format is supported\n
 # by browser\n
-file_name = context.getStandardFileName(None)\n
+file_name = context.getStandardFileName(format)\n
 response.setHeader(\'Content-disposition\', \'attachment; filename="%s"\' % file_name)\n
 \n
 try:\n
-  return context.index_html(request, response)\n
+  return context.index_html(request, response, format)\n
 except Unauthorized:\n
   msg = context.Base_translateString("You do not have enough permission for converting this document.")\n
   return context.Base_redirect(keep_items=dict(portal_status_message=msg))\n
@@ -110,8 +111,9 @@ except Unauthorized:\n
                             <string>response</string>
                             <string>zExceptions</string>
                             <string>Unauthorized</string>
-                            <string>context</string>
                             <string>None</string>
+                            <string>format</string>
+                            <string>context</string>
                             <string>file_name</string>
                             <string>msg</string>
                             <string>dict</string>

Modified: erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision?rev=37800&r1=37799&r2=37800&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Fri Aug 13 15:52:26 2010
@@ -1 +1 @@
-1646
\ No newline at end of file
+1650
\ No newline at end of file




More information about the Erp5-report mailing list