summaryrefslogtreecommitdiff
path: root/addons/web/static/src
diff options
context:
space:
mode:
authorChristophe Matthieu <chm@odoo.com>2016-09-12 10:10:49 +0200
committerChristophe Matthieu <chm@odoo.com>2016-09-12 10:10:49 +0200
commit8182d98ac717f5faa028897ae5ef8f21d9a00a92 (patch)
treeea960f9a604b4ecf4d4a402b3c5511d5ec02464c /addons/web/static/src
parentdc4d6b6a7a2ed8bd88c389dd72d1a5ef137c333c (diff)
parent2adcf523cfe6fff88c62df017880ca8c3b321c15 (diff)
[FIX] web: traceback when click on logo 'Edit Company data' button
Diffstat (limited to 'addons/web/static/src')
-rw-r--r--addons/web/static/src/js/web_client.js17
1 files changed, 9 insertions, 8 deletions
diff --git a/addons/web/static/src/js/web_client.js b/addons/web/static/src/js/web_client.js
index 4ec80b60cc9..4a9ce5e11ff 100644
--- a/addons/web/static/src/js/web_client.js
+++ b/addons/web/static/src/js/web_client.js
@@ -59,10 +59,10 @@ return AbstractWebClient.extend({
toggle_bars: function(value) {
this.$('tr:has(td.navbar),.oe_leftbar').toggle(value);
},
- update_logo: function() {
+ update_logo: function(reload) {
var company = session.company_id;
var img = session.url('/web/binary/company_logo' + '?db=' + session.db + (company ? '&company=' + company : ''));
- this.$('.oe_logo img').attr('src', '').attr('src', img);
+ this.$('.o_sub_menu_logo img').attr('src', '').attr('src', img + (reload ? "#" + Date.now() : ''));
this.$('.oe_logo_edit').toggleClass('oe_logo_edit_admin', session.uid === 1);
},
logo_edit: function(ev) {
@@ -77,12 +77,13 @@ return AbstractWebClient.extend({
action_buttons: true,
headless: true,
};
- self.action_manager.do_action(result);
- var form = self.action_manager.dialog_widget.views.form.controller;
- form.on("on_button_cancel", self.action_manager, self.action_manager.dialog_stop);
- form.on('record_saved', self, function() {
- self.action_manager.dialog_stop();
- self.update_logo();
+ self.action_manager.do_action(result).then(function () {
+ var form = self.action_manager.dialog_widget.views.form.controller;
+ form.on("on_button_cancel", self.action_manager, self.action_manager.dialog_stop);
+ form.on('record_saved', self, function() {
+ self.action_manager.dialog_stop();
+ self.update_logo();
+ });
});
});
});