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

[FIX] Fix not working code, and some cleaning proposed by AL 

bzr revid: vta@openerp.com-20121226181833-kih09glellxisl9p
This commit is contained in:
vta vta@openerp.com 2012-12-26 19:18:33 +01:00
parent 78f36a2fce
commit 39e5509e6c
4 changed files with 19 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
addons/web/controllers/main.py
View File

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

18
addons/web/static/src/js/coresetup.js
View File

@ -49,7 +49,6 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
_(this.module_list).each(function (mod) {
self.module_loaded[mod] = true;
});
this.context = {};
this.active_id = null;
return this.session_init();
},
@ -86,13 +85,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
// If immediately follows a login (triggered by trying to restore
// an invalid session or no session at all), refresh session data
// (should not change, but just in case...)
_.extend(self, {
session_id: result.session_id,
db: result.db,
username: result.login,
uid: result.uid,
user_context: result.context
});
_.extend(self,result);
});
},
session_is_valid: function() {
@ -109,14 +102,7 @@ instance.web.Session = instance.web.JsonRPC.extend( /** @lends instance.web.Sess
if (!result.uid) {
return $.Deferred().reject();
}
_.extend(self, {
session_id: result.session_id,
db: result.db,
username: result.login,
uid: result.uid,
user_context: result.context
});
_.extend(self, result);
if (!_volatile) {
self.set_cookie('session_id', self.session_id);
}