[MERGE] trunk

bzr revid: al@openerp.com-20111215184305-3yxw54l91psrz5d6
2011-12-15 19:43:05 +01:00
parent 4206e4d262 72e820765f
commit 2fd2f299b4
13 changed files with 209 additions and 53 deletions
@@ -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]