From 31e65bdddf56510db08116029113d5966cd6a51f Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 15 Dec 2011 13:07:32 +0100 Subject: partial rework to merge trunk bzr revid: al@openerp.com-20111215120732-is7pab5e5rsfqpj0 --- addons/web/controllers/main.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) (limited to 'addons/web/controllers/main.py') diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 81061ba5477..c286819ab86 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -242,6 +242,21 @@ class WebClient(openerpweb.Controller): "version": web.common.release.version } +class Proxy(openerpweb.Controller): + _cp_path = '/web/proxy' + + @jsonrequest + def load(self, req, path): + #req.config.socket_port + #if not re.match('^/[^/]+/static/.*', path): + # return werkzeug.exceptions.BadRequest() + + env = req.httprequest.environ + port = env['SERVER_PORT'] + + o = urllib.urlopen('http://127.0.0.1:%s%s' % (port, path)) + return o.read() + class Database(openerpweb.Controller): _cp_path = "/web/database" -- cgit v1.2.3 From 8721df9d549e72b7154ae34dff53aa4b82718b85 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 16 Dec 2011 01:44:02 +0100 Subject: [IMP] massive connection deferrization, json works again bzr revid: al@openerp.com-20111216004402-q6v26822swarra7r --- addons/web/controllers/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addons/web/controllers/main.py') diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index e745020c594..9c6edcf378a 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -10,6 +10,7 @@ import os import re import simplejson import time +import urllib2 import xmlrpclib import zlib from xml.etree import ElementTree @@ -245,7 +246,7 @@ class WebClient(openerpweb.Controller): class Proxy(openerpweb.Controller): _cp_path = '/web/proxy' - @jsonrequest + @openerpweb.jsonrequest def load(self, req, path): #req.config.socket_port #if not re.match('^/[^/]+/static/.*', path): @@ -254,7 +255,7 @@ class Proxy(openerpweb.Controller): env = req.httprequest.environ port = env['SERVER_PORT'] - o = urllib.urlopen('http://127.0.0.1:%s%s' % (port, path)) + o = urllib2.urlopen('http://127.0.0.1:%s%s' % (port, path)) return o.read() class Database(openerpweb.Controller): -- cgit v1.2.3 From d315489256557498de4e3c641a7cc28e6550d575 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Fri, 16 Dec 2011 02:25:42 +0100 Subject: [FIX] session cookie and logout bzr revid: al@openerp.com-20111216012542-svbiuf64x017wll5 --- addons/web/controllers/main.py | 1 - 1 file changed, 1 deletion(-) (limited to 'addons/web/controllers/main.py') diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 9c6edcf378a..fc9ae1dec16 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -375,7 +375,6 @@ class Session(openerpweb.Controller): @openerpweb.jsonrequest def get_session_info(self, req): - req.session.assert_valid(force=True) return { "uid": req.session._uid, "context": req.session.get_context() if req.session._uid else False, -- cgit v1.2.3