[Erp5-report] r35740 jerome - in /erp5/trunk/products/ERP5/bootstrap/erp5_core: SkinTemplat...

[nobody at svn.erp5.org]

Author: jerome
Date: Fri May 28 16:59:31 2010
New Revision: 35740

URL: http://svn.erp5.org?rev=35740&view=rev
Log:
headers will be set by index_html

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=35740&r1=35739&r2=35740&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 May 28 16:59:31 2010
@@ -58,21 +58,11 @@
 \n
 from zExceptions import Unauthorized\n
 \n
-if hasattr(context,\'getContentType\'):\n
-  response.setHeader(\'Content-type\', context.getContentType())\n
-else:\n
-  response.setHeader(\'Content-type\', context.getFormat())\n
-\n
-file_name = context.getSourceReference() or context.getTitle() or context.getId()\n
-response.setHeader(\'Content-disposition\', \'attachment; filename="%s"\' % file_name)\n
-\n
 try:\n
-  result = context.index_html(request, response)\n
+  return context.index_html(request, response)\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
-\n
-return result\n
 </string> </value>
         </item>
         <item>
@@ -115,10 +105,7 @@
                             <string>response</string>
                             <string>zExceptions</string>
                             <string>Unauthorized</string>
-                            <string>hasattr</string>
                             <string>context</string>
-                            <string>file_name</string>
-                            <string>result</string>
                             <string>msg</string>
                             <string>dict</string>
                           </tuple>

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=35740&r1=35739&r2=35740&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] (original)
+++ erp5/trunk/products/ERP5/bootstrap/erp5_core/bt/revision [utf8] Fri May 28 16:59:31 2010
@@ -1,1 +1,1 @@
-1592
+1593