Merge lp:~openerp-dev/openobject-addons/7.0-opw-606233-jas into lp:openobject-addons/7.0

[Anaël Closson (openerp)]

[Jamin Shah(OpenERP) (jamin-openerp)]

Hello,

Fixed the issue of wrong Mime type, used python mimetypes module to detect proper mimetype of the file.

Demo: Go to chatter or wall and try to download different types of file, some browser will popup to open file in application say for example Firefox, it popup and based on your file mimetype it gives you application to openwith, currently we passed application/octet-stream, so Firefox suggests wrong applicatio to openwith.

Used mimetypes and guess mimetype based on filename.

Thanks.

[Martin Trigaux (OpenERP) (mat-openerp)]

LGTM, thanks

revno: 10022 [merge]
revision-id: <email address hidden>

review: Approve

=== modified file 'mail/controllers/main.py'
--- mail/controllers/main.py	2012-12-11 14:53:43 +0000
+++ mail/controllers/main.py	2014-04-14 07:40:29 +0000
@@ -1,6 +1,7 @@
 import base64
 import openerp.addons.web.http as oeweb
 from openerp.addons.web.controllers.main import content_disposition
+import mimetypes
 
 #----------------------------------------------------------
 # Controller
@@ -15,8 +16,9 @@
         if res:
             filecontent = base64.b64decode(res.get('base64'))
             filename = res.get('filename')
+            content_type = mimetypes.guess_type(filename)
             if filecontent and filename:
                 return req.make_response(filecontent,
-                    headers=[('Content-Type', 'application/octet-stream'),
+                    headers=[('Content-Type', content_type[0] or 'application/octet-stream'),
                             ('Content-Disposition', content_disposition(filename, req))])
         return req.not_found()