From 8877c10161fc66e2b16b2ae81beaf34749b32396 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 14 Feb 2014 12:15:40 +0100 Subject: [PATCH 1/2] [FIX] login: look at the value of action_id on the current res.users to execute the action instead of the first link (Inbox). Bring back 6.1 behaviour. bzr revid: mat@openerp.com-20140214111540-sbn3y6ou3vrjza15 --- addons/web/static/src/js/chrome.js | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index b51f86ba195..3e42a697c19 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1407,12 +1407,18 @@ instance.web.WebClient = instance.web.Client.extend({ $(window).bind('hashchange', this.on_hashchange); var state = $.bbq.getState(true); + if (_.isEmpty(state) || state.action == "login") { self.menu.has_been_loaded.done(function() { - var first_menu_id = self.menu.$el.find("a:first").data("menu"); - if(first_menu_id) { - self.menu.menu_click(first_menu_id); - } + new instance.web.Model("res.users").call("read", [self.session.uid, ["action_id"]]).done(function(data) { + if(data.action_id) { + self.action_manager.do_action(data.action_id[0]); + } else { + var first_menu_id = self.menu.$el.find("a:first").data("menu"); + if(first_menu_id) + self.menu.menu_click(first_menu_id); + } + }); }); } else { $(window).trigger('hashchange'); From d65df64cddcfe2cfd9bb23ab2aca3b85a35aa1d3 Mon Sep 17 00:00:00 2001 From: Martin Trigaux Date: Fri, 14 Feb 2014 12:17:07 +0100 Subject: [PATCH 2/2] [IMP] always click on first link to have menus and breadcrumb bzr revid: mat@openerp.com-20140214111707-7zzpeccs9aanfdct --- addons/web/static/src/js/chrome.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/web/static/src/js/chrome.js b/addons/web/static/src/js/chrome.js index 3e42a697c19..fed67a8af1f 100644 --- a/addons/web/static/src/js/chrome.js +++ b/addons/web/static/src/js/chrome.js @@ -1411,12 +1411,12 @@ instance.web.WebClient = instance.web.Client.extend({ if (_.isEmpty(state) || state.action == "login") { self.menu.has_been_loaded.done(function() { new instance.web.Model("res.users").call("read", [self.session.uid, ["action_id"]]).done(function(data) { + var first_menu_id = self.menu.$el.find("a:first").data("menu"); + if(first_menu_id) + self.menu.menu_click(first_menu_id); + if(data.action_id) { self.action_manager.do_action(data.action_id[0]); - } else { - var first_menu_id = self.menu.$el.find("a:first").data("menu"); - if(first_menu_id) - self.menu.menu_click(first_menu_id); } }); });