From f3573d844e0521dcff8954fb261759ef38986c85 Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Wed, 12 Oct 2011 18:12:08 +0200 Subject: [PATCH] [IMP] use login_env for login bzr revid: chs@openerp.com-20111012161208-yto1rang9znmoh4i --- addons/web/common/session.py | 4 ++-- addons/web/controllers/main.py | 11 ++++++++++- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/addons/web/common/session.py b/addons/web/common/session.py index e8027db8ea4..ef38fc6a154 100644 --- a/addons/web/common/session.py +++ b/addons/web/common/session.py @@ -58,8 +58,8 @@ class OpenERPSession(object): self._login = login self._password = password - def login(self, db, login, password): - uid = self.proxy('common').login(db, login, password) + def login(self, db, login, password, env): + uid = self.proxy('common').login_env(db, login, password, 'web', env) self.bind(db, uid, login, password) if uid: self.get_context() diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 7ca80fbfdec..2432edc71ea 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -5,6 +5,7 @@ import base64 import csv import glob import itertools +import logging import operator import os import re @@ -21,6 +22,8 @@ import babel.messages.pofile import web.common openerpweb = web.common.http +_logger = logging.getLogger(__name__) + #---------------------------------------------------------- # OpenERP Web web Controllers #---------------------------------------------------------- @@ -263,7 +266,13 @@ class Session(openerpweb.Controller): @openerpweb.jsonrequest def login(self, req, db, login, password): - req.session.login(db, login, password) + wsgienv = req.httprequest.environ + env = dict( + host='%s://%s' % (wsgienv['wsgi.url_scheme'], wsgienv['HTTP_HOST']), + referrer=wsgienv.get('HTTP_REFERER'), + REMOTE_ADDR=wsgienv['REMOTE_ADDR'], + ) + req.session.login(db, login, password, env) ctx = req.session.get_context() if req.session._uid else {} return {