pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] web: can use web/image controller for attachment type url

Browse Source 
Attachment type url return a status 301 for response
This commit is contained in:
Christophe Matthieu
2015-10-26 11:43:36 +01:00
parent 890f1302c7
commit 63392cc239
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/controllers/main.py
+9 -1
View File
@@ -506,7 +506,11 @@ def binary_content(xmlid=None, model='ir.attachment', id=None, field='datas', un
headers.append(('Content-Disposition', content_disposition(filename)))
# get content after cache control
content = obj[field] or ''
if model == 'ir.attachment' and obj.type == 'url' and obj.url:
status = 301
content = obj.url
else:
content = obj[field] or ''
return (status, headers, content)
@@ -1043,6 +1047,8 @@ class Binary(http.Controller):
status, headers, content = binary_content(xmlid=xmlid, model=model, id=id, field=field, unique=unique, filename=filename, filename_field=filename_field, download=download, mimetype=mimetype)
if status == 304:
response = werkzeug.wrappers.Response(status=status, headers=headers)
elif status == 301:
return werkzeug.utils.redirect(content, code=301)
elif status != 200:
response = request.not_found()
else:
@@ -1074,6 +1080,8 @@ class Binary(http.Controller):
status, headers, content = binary_content(xmlid=xmlid, model=model, id=id, field=field, unique=unique, filename=filename, filename_field=filename_field, download=download, mimetype=mimetype, default_mimetype='image/png')
if status == 304:
return werkzeug.wrappers.Response(status=304, headers=headers)
elif status == 301:
return werkzeug.utils.redirect(content, code=301)
elif status != 200 and download:
return request.not_found()