odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] some more problems with werkzeug 0.9.1 

bzr revid: nicolas.vanhoren@openerp.com-20130716131401-abj3i020a8831l98
This commit is contained in:
niv-openerp 2013-07-16 15:14:01 +02:00
parent 7c4f374aca
commit 788071f34f
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/web/controllers/main.py
View File

@ -778,7 +778,7 @@ class Database(http.Controller):
return request.make_response(db_dump,
[('Content-Type', 'application/octet-stream; charset=binary'),
('Content-Disposition', content_disposition(filename))],
{'fileToken': int(token)}
{'fileToken': token}
)
except Exception, e:
return simplejson.dumps([[],[{'error': openerp.tools.ustr(e), 'title': _('Backup Database')}]])
@ -1273,7 +1273,7 @@ class Binary(http.Controller):
return request.make_response(filecontent,
headers=[('Content-Type', 'application/octet-stream'),
('Content-Disposition', content_disposition(filename))],
cookies={'fileToken': int(token)})
cookies={'fileToken': token})
@http.route('/web/binary/upload', type='http', auth="user")
def upload(self, callback, ufile):
@ -1572,7 +1572,7 @@ class ExportFormat(object):
headers=[('Content-Disposition',
content_disposition(self.filename(model))),
('Content-Type', self.content_type)],
cookies={'fileToken': int(token)})
cookies={'fileToken': token})
class CSVExport(ExportFormat, http.Controller):
fmt = {'tag': 'csv', 'label': 'CSV'}