From 83462b5830470e8a14ab2abb461781bf93c4609b Mon Sep 17 00:00:00 2001 From: Christophe Simonis Date: Fri, 9 Nov 2012 18:31:46 +0100 Subject: [PATCH] [FIX] correct then/done errors + highlight "installed modules" menu when apps is not reachable bzr revid: chs@openerp.com-20121109173146-5mzdtyni92v3ub1d --- openerp/addons/base/static/src/js/apps.js | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/openerp/addons/base/static/src/js/apps.js b/openerp/addons/base/static/src/js/apps.js index dde7a0a72e1..d755cf6d780 100644 --- a/openerp/addons/base/static/src/js/apps.js +++ b/openerp/addons/base/static/src/js/apps.js @@ -19,20 +19,22 @@ openerp.base = function(instance) { i.onload = function() { console.log('client is available', client); - client.session.session_bind(client.origin).done(function() { + client.session.session_bind(client.origin).then(function() { // check if client can authenticate - client.authenticate().done(function() { + client.authenticate().then( + function() { /* done */ d.resolve(client); - }).fail(function() { + }, function() { /* fail */ if (client.login === 'anonymous') { d.reject(client); } else { sessionStorage.removeItem('apps.login'); sessionStorage.removeItem('apps.access_token'); client.bind(client.dbname, 'anonymous', 'anonymous'); - client.authenticate().done(function() { + client.authenticate().then( + function() { /* done */ d.resolve(client); - }).fail(function() { + }, function() { /* fail */ d.reject(client); }); } @@ -118,7 +120,10 @@ openerp.base = function(instance) { }). fail(function(client) { self.do_warn('Apps Server not reachable.', 'Showing local modules.', true); - self.do_action(self.failback_action_id); + self.rpc('/web/action/load', {action_id: self.failback_action_id}).done(function(action) { + self.do_action(action); + instance.webclient.menu.open_action(action.id); + }); }); },