From 62bc63e44f470ce0d6003fcc1fb9fd2d16350e4e Mon Sep 17 00:00:00 2001 From: Denis Ledoux Date: Thu, 27 Nov 2014 15:19:39 +0100 Subject: [PATCH] [FIX] web: force company_logo change on company change In multi company environment, the company logo was not updated on company change in the user preferences This disrupted the end user, as he might think the company change did not happen. --- addons/web/controllers/main.py | 1 + addons/web/static/src/js/chrome.js | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index e2c3d3092c8..1cea529a86a 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -773,6 +773,7 @@ class Session(http.Controller): "user_context": request.session.get_context() if request.session.uid else {}, "db": request.session.db, "username": request.session.login, + "company_id": request.env.user.company_id.id if request.session.uid else None, } @http.route('/web/session/get_session_info', type='json', auth="none") diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index bbf36152735..a9a458c8e78 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1292,7 +1292,8 @@ instance.web.WebClient = instance.web.Client.extend({ } }, update_logo: function() { - var img = this.session.url('/web/binary/company_logo'); + var company = this.session.company_id; + var img = this.session.url('/web/binary/company_logo' + (company ? '?company=' + company : '')); this.$('.oe_logo img').attr('src', '').attr('src', img); this.$('.oe_logo_edit').toggleClass('oe_logo_edit_admin', this.session.uid === 1); },