downloadable: Always set content-disposition: inline when displaying inline

A previous operation might have poluted the request
(cherry picked from commit 7ddb9c10)

bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_renderSimpleView.xml

@@ -62,9 +62,14 @@ if skin_name and skin_name != \'None\': # make_query serializes None as \'None\'
 with portal.Localizer.translationContext(localizer_language):\n
   report_data = getattr(context, deferred_style_dialog_method)(**params)\n
 \n
-  attachment_name = [x[len(\' filename=\'):] for x in (request.RESPONSE.getHeader(\n
-                          \'content-disposition\') or \'\').split(\';\')\n
-                        if x.startswith(\' filename=\')][0]\n
+  attachment_name_list = [x[len(\' filename=\'):] for x in (request.RESPONSE.getHeader(\n
+                        \'content-disposition\') or \'\').split(\';\')\n
+                            if x.startswith(\' filename=\')]\n
+  if attachment_name_list:\n
+    attachment_name, = attachment_name_list\n
+  else:\n
+    assert \'inline\' in (request.RESPONSE.getHeader(\'content-disposition\') or \'\')\n
+    attachment_name = \'index.html\'\n
   if attachment_name.startswith(\'"\'):\n
     attachment_name = attachment_name[1:]\n
   if attachment_name.endswith(\'"\'):\n

bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/Base_report.xml

@@ -75,9 +75,14 @@ with portal.Localizer.translationContext(localizer_language):\n
                          report_method=dummyReportMethod,\n
                          form=portal.restrictedTraverse(form_path)))\n
 \n
-  attachment_name = [x[len(\' filename=\'):] for x in (request.RESPONSE.getHeader(\n
+  attachment_name_list = [x[len(\' filename=\'):] for x in (request.RESPONSE.getHeader(\n
                         \'content-disposition\') or \'\').split(\';\')\n
-                      if x.startswith(\' filename=\')][0]\n
+                            if x.startswith(\' filename=\')]\n
+  if attachment_name_list:\n
+    attachment_name, = attachment_name_list\n
+  else:\n
+    assert \'inline\' in (request.RESPONSE.getHeader(\'content-disposition\') or \'\')\n
+    attachment_name = \'index.html\'\n
   if attachment_name.startswith(\'"\'):\n
     attachment_name = attachment_name[1:]\n
   if attachment_name.endswith(\'"\'):\n

product/ERP5/mixin/downloadable.py

@@ -127,6 +127,8 @@ class DownloadableMixin:
       RESPONSE.setHeader('Content-Disposition',
                          'attachment; filename="%s"' % filename)
       RESPONSE.setHeader('Accept-Ranges', 'bytes')
+    else:
+      RESPONSE.setHeader('Content-Disposition', 'inline')
     return str(data)
 
   security.declareProtected(Permissions.AccessContentsInformation,