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

[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
This commit is contained in:
Xavier Morel 2011-08-17 12:38:33 +02:00
parent 046887d280
commit fc420d4ded
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/base/controllers/main.py
View File

@ -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')

3
openerpweb/openerpweb.py
View File

@ -371,7 +371,8 @@ class HttpRequest(object):
self.context = kw.get('context', {})
host = cherrypy.config['openerp.server.host']
port = cherrypy.config['openerp.server.port']
self.session = self.httpsession.setdefault(kw.pop('session_id', None), OpenERPSession(host, port))
self.session_id = kw.pop('session_id', None)
self.session = self.httpsession.setdefault(self.session_id, OpenERPSession(host, port))
self.result = ""
if request.method == 'GET':
print "GET --> %s.%s %s %r" % (controller.__class__.__name__, f.__name__, request, kw)