← Back to team overview

openerp-dev-web team mailing list archive

[Merge] lp:~openerp-dev/openobject-client-web/6.0-bug-768963-xrg into lp:openobject-client-web/6.0

 

xrg has proposed merging lp:~openerp-dev/openobject-client-web/6.0-bug-768963-xrg into lp:openobject-client-web/6.0.

Requested reviews:
  OpenERP Core Team (openerp)
Related bugs:
  Bug #768963 in OpenERP Web Client: "controllers: fix payload fed to base64.decode"
  https://bugs.launchpad.net/openobject-client-web/+bug/768963

For more details, see:
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-bug-768963-xrg/+merge/58812
-- 
https://code.launchpad.net/~openerp-dev/openobject-client-web/6.0-bug-768963-xrg/+merge/58812
Your team OpenERP R&D Team is subscribed to branch lp:~openerp-dev/openobject-client-web/6.0-bug-768963-xrg.
=== modified file 'addons/openerp/controllers/execute.py'
--- addons/openerp/controllers/execute.py	2011-01-21 00:05:10 +0000
+++ addons/openerp/controllers/execute.py	2011-04-22 13:18:30 +0000
@@ -15,7 +15,7 @@
     def index(self, payload):
         decoded_payload = ast.literal_eval(
             zlib.decompress(
-                base64.urlsafe_b64decode(payload)))
+                base64.urlsafe_b64decode(str(payload))))
         action, data = decoded_payload['action'], decoded_payload['data']
         cherrypy.request.params.update(decoded_payload)
         return actions.execute(action, **data)


Follow ups