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

[FIX] display user login in static home page 

lp bug: https://launchpad.net/bugs/887969 fixed

bzr revid: xmo@openerp.com-20111118111521-7dem9bsa3z0fy3ej
This commit is contained in:
Xavier Morel 2011-11-18 12:15:21 +01:00
parent 210c58d825
commit e6f0378bd8
3 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -338,7 +338,8 @@ class Session(openerpweb.Controller):
"session_id": req.session_id,
"uid": req.session._uid,
"context": ctx,
"db": req.session._db
"db": req.session._db,
"login": req.session._login
}
@openerpweb.jsonrequest
@ -347,7 +348,8 @@ class Session(openerpweb.Controller):
return {
"uid": req.session._uid,
"context": req.session.get_context() if req.session._uid else False,
"db": req.session._db
"db": req.session._db,
"login": req.session._login
}
@openerpweb.jsonrequest

21
addons/web/static/src/js/core.js
View File

@ -358,6 +358,7 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
this.debug = (window.location.search.indexOf('?debug') !== -1);
this.session_id = false;
this.uid = false;
this.username = false;
this.user_context= {};
this.db = false;
this.module_list = [];
@ -488,10 +489,13 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
var self = this;
var params = { db: db, login: login, password: password };
return this.rpc("/web/session/login", params, function(result) {
self.session_id = result.session_id;
self.uid = result.uid;
self.user_context = result.context;
self.db = result.db;
_.extend(self, {
session_id: result.session_id,
uid: result.uid,
user_context: result.context,
db: result.db,
username: result.login
});
self.session_save();
self.on_session_valid();
return true;
@ -505,9 +509,12 @@ openerp.web.Connection = openerp.web.CallbackEnabled.extend( /** @lends openerp.
var self = this;
this.session_id = this.get_cookie('session_id');
return this.rpc("/web/session/get_session_info", {}).then(function(result) {
self.uid = result.uid;
self.user_context = result.context;
self.db = result.db;
_.extend(self, {
uid: result.uid,
user_context: result.context,
db: result.db,
username: result.login
});
if (self.uid)
self.on_session_valid();
else

2
addons/web_dashboard/static/src/xml/web_dashboard.xml
View File

@ -116,7 +116,7 @@
<h1>Welcome to your new OpenERP instance.</h1>
<div class="oe-static-home-banner">
<li>Remember to bookmark this page.</li>
<li>Remember your login: <i><t t-esc="session.login"/></i></li>
<li>Remember your login: <t t-esc="session.username"/></li>
<li>Choose the first OpenERP Application you want to install..</li>
</div>
<div class="oe-static-home-tiles">