From 43eefa0fa655f9f67ffb5ab71730b790c3fc6b4e Mon Sep 17 00:00:00 2001
From: niv-openerp <nicolas.vanhoren@openerp.com>
Date: Mon, 5 Sep 2011 11:23:15 +0200
Subject: [PATCH] [imp] Added name of company & name of user in header.

bzr revid: nicolas.vanhoren@openerp.com-20110905092315-ddjn1la19jh1u09u
---
 addons/web/static/src/js/chrome.js | 14 +++++++++-----
 addons/web/static/src/xml/base.xml |  4 ++--
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js
index 2d7515391c6..d82bb78ae1d 100644
--- a/addons/web/static/src/js/chrome.js
+++ b/addons/web/static/src/js/chrome.js
@@ -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();
diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index af80d7d7163..9542e8d4f63 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -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">