odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] correct then/done errors + highlight "installed modules" menu when apps is not reachable 

bzr revid: chs@openerp.com-20121109173146-5mzdtyni92v3ub1d
This commit is contained in:
Christophe Simonis 2012-11-09 18:31:46 +01:00
parent 885880675a
commit 83462b5830
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
openerp/addons/base/static/src/js/apps.js
View File

@ -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);
});
});
},