From 2ba6a7f073592a1c625d31c9a7e5681d1f91e270 Mon Sep 17 00:00:00 2001 From: ggh-openerp Date: Thu, 11 Oct 2012 15:15:38 +0530 Subject: [IMP] Remove add in on_menu_logout method bzr revid: ggh@tinyerp.com-20121011094538-d8xrxa0tygrhljdf --- addons/web/static/src/js/chrome.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'addons/web/static/src/js/chrome.js') diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index b605f4ad4e1..67e36678040 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -881,6 +881,7 @@ instance.web.UserMenu = instance.web.Widget.extend({ on_action: function() { }, on_menu_logout: function() { + this.trigger('user_logout'); }, on_menu_settings: function() { var self = this; @@ -1039,7 +1040,7 @@ instance.web.WebClient = instance.web.Client.extend({ self.menu.on('menu_click', this, this.on_menu_action); self.user_menu = new instance.web.UserMenu(self); self.user_menu.replace(this.$el.find('.oe_user_menu_placeholder')); - self.user_menu.on_menu_logout.add(this.proxy('on_logout')); + self.user_menu.on('user_logout', self, this.proxy('on_logout')); self.user_menu.on_action.add(this.proxy('on_menu_action')); self.user_menu.do_update(); self.bind_hashchange(); -- cgit v1.2.3 From e50cb5b2c7b6b8d0c213613afdffaa1296b2a759 Mon Sep 17 00:00:00 2001 From: Antony Lesuisse Date: Thu, 11 Oct 2012 22:15:23 +0200 Subject: [FIX] dont show errors on reload bzr revid: al@openerp.com-20121011201523-d4t500g4nnfq9ce6 --- addons/web/static/src/js/chrome.js | 1 + 1 file changed, 1 insertion(+) (limited to 'addons/web/static/src/js/chrome.js') diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 67e36678040..d7272d8d83f 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -627,6 +627,7 @@ instance.web.Reload = function(parent, params) { hash = "#menu_id=" + menu_id; } var url = l.protocol + "//" + l.host + l.pathname + search + hash; + window.onerror = function() {}; window.location = url; }; instance.web.client_actions.add("reload", "instance.web.Reload"); -- cgit v1.2.3