diff options
| author | vta vta@openerp.com <> | 2012-12-26 19:18:33 +0100 |
|---|---|---|
| committer | vta vta@openerp.com <> | 2012-12-26 19:18:33 +0100 |
| commit | 39e5509e6c2140b8dcd6180662c2979c58cfdccb (patch) | |
| tree | 31cd5a326bbe68cf165c2e445c005e8a1cef91c2 /addons/web/controllers/main.py | |
| parent | 78f36a2fce5557aa8f756c81d9673135cfefef1d (diff) | |
[FIX] Fix not working code, and some cleaning proposed by AL
bzr revid: vta@openerp.com-20121226181833-kih09glellxisl9p
Diffstat (limited to 'addons/web/controllers/main.py')
| -rw-r--r-- | addons/web/controllers/main.py | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 1be8a2b4796..1d5cfabec2c 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -656,9 +656,6 @@ class WebClient(openerpweb.Controller): def translations(self, req, mods, lang): res_lang = req.session.model('res.lang') ids = res_lang.search([("code", "=", lang)]) - if not ids: - ids = res_lang.search([("iso_code", "=", lang)]) - lang = res_lang.search_read([('id', "in", ids)], ["code"])[0]['code'] lang_params = None if ids: lang_params = res_lang.read(ids[0], ["direction", "date_format", "time_format", @@ -800,9 +797,9 @@ class Session(openerpweb.Controller): return { "session_id": req.session_id, "uid": req.session._uid, - "context": req.session.get_context() if req.session._uid else {}, + "user_context": req.session.get_context() if req.session._uid else {}, "db": req.session._db, - "login": req.session._login, + "username": req.session._login, } @openerpweb.jsonrequest |