pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[imp] Added name of company & name of user in header.

Browse Source 
bzr revid: nicolas.vanhoren@openerp.com-20110905092315-ddjn1la19jh1u09u
This commit is contained in:
niv-openerp
2011-09-05 11:23:15 +02:00
parent 32441da020
commit 43eefa0fa6
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/src/js/chrome.js
+9 -5
View File
@@ -538,11 +538,15 @@ openerp.web.Header = openerp.web.Widget.extend({
this._super();
},
do_update: function () {
this.$content = $(QWeb.render("Header-content", {widget: this}));
this.$content.appendTo(this.$element);
this.$element.find(".logout").click(this.on_logout);
this.$element.find("a.preferences").click(this.on_preferences);
return this.shortcut_load();
var self = this;
return new openerp.base.Model(self.session, "res.users")
.get_func("read")(self.session.uid, ["name", "company_id"]).pipe(function(res) {
self.$content = $(QWeb.render("Header-content", {widget: self, user: res}));
self.$content.appendTo(self.$element);
self.$element.find(".logout").click(self.on_logout);
self.$element.find("a.preferences").click(self.on_preferences);
return self.shortcut_load();
});
},
do_reset: function() {
this.$content.remove();
addons/web/static/src/xml/base.xml
+2 -2
View File
@@ -334,8 +334,8 @@
</t>
<t t-name="Header-content">
<h1 class="header_title">
(<t t-esc="widget.session.db"/>)<br/>
<small class="username"><t t-esc="widget.session.login"/></small>
<t t-esc="user.company_id[1]"/> (<t t-esc="widget.session.db"/>)<br/>
<small class="username"><t t-esc="user.name"/></small>
</h1>
<div class="header_corner">
<ul class="block">