diff options
| author | Antony Lesuisse <al@openerp.com> | 2011-12-15 19:43:05 +0100 |
|---|---|---|
| committer | Antony Lesuisse <al@openerp.com> | 2011-12-15 19:43:05 +0100 |
| commit | 2fd2f299b40a03044e5700509f18ae2ac2c0afce (patch) | |
| tree | 67d8b4faa981df4b308bcf6261095c0f898fc77a /addons/web/controllers | |
| parent | 4206e4d2627be8ca252fdfce2f90654ff9db0055 (diff) | |
| parent | 72e820765fccc9227c8b684e3d42f6344756cffc (diff) | |
[MERGE] trunk
bzr revid: al@openerp.com-20111215184305-3yxw54l91psrz5d6
Diffstat (limited to 'addons/web/controllers')
| -rw-r--r-- | addons/web/controllers/main.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index c286819ab86..e745020c594 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -285,7 +285,7 @@ class Database(openerpweb.Controller): params['db_lang'], params['create_admin_pwd'] ) - + try: return req.session.proxy("db").create(*create_attrs) except xmlrpclib.Fault, e: @@ -1196,7 +1196,7 @@ class Binary(openerpweb.Controller): } </script>""" data = ufile.read() - args = [ufile.content_length, ufile.filename, + args = [len(data), ufile.filename, ufile.content_type, base64.b64encode(data)] except Exception, e: args = [False, e.message] |