summaryrefslogtreecommitdiff
path: root/addons/base/controllers
diff options
context:
space:
mode:
authorXavier Morel <xmo@openerp.com>2011-08-17 12:38:33 +0200
committerXavier Morel <xmo@openerp.com>2011-08-17 12:38:33 +0200
commitfc420d4ded3802e882dbcfb17ce68d2479de7aaf (patch)
tree95774ffc5b0386cd5da20650051025659243e289 /addons/base/controllers
parent046887d2805a21cf6a458b49c609c3c17eb54873 (diff)
[FIX] make http request object more similar to json request object: move session_id to an attribute on the request obj, avoid taking session_id as param on httprequest methods
bzr revid: xmo@openerp.com-20110817103833-7flirk84a4jtelvx
Diffstat (limited to 'addons/base/controllers')
-rw-r--r--addons/base/controllers/main.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/base/controllers/main.py b/addons/base/controllers/main.py
index 3b1390f2a72..65e061211f8 100644
--- a/addons/base/controllers/main.py
+++ b/addons/base/controllers/main.py
@@ -979,7 +979,7 @@ class Binary(openerpweb.Controller):
return base64.decodestring(filecontent)
@openerpweb.httprequest
- def upload(self, request, session_id, callback, ufile=None):
+ def upload(self, request, callback, ufile=None):
cherrypy.response.timeout = 500
headers = {}
for key, val in cherrypy.request.headers.iteritems():
@@ -1006,7 +1006,7 @@ class Binary(openerpweb.Controller):
return out % (simplejson.dumps(callback), simplejson.dumps(args))
@openerpweb.httprequest
- def upload_attachment(self, request, session_id, callback, model, id, ufile=None):
+ def upload_attachment(self, request, callback, model, id, ufile=None):
cherrypy.response.timeout = 500
context = request.session.eval_context(request.context)
Model = request.session.model('ir.attachment')