[FIX] Fix modules for monodb login
bzr revid: fme@openerp.com-20130228163319-lyu985ueqj7xpr6u
This commit is contained in:
parent
be867174aa
commit
97698c02b0
|
@ -29,8 +29,7 @@ openerp.auth_signup = function(instance) {
|
||||||
return false;
|
return false;
|
||||||
});
|
});
|
||||||
|
|
||||||
var dblist = self.db_list || [];
|
var dbname = self.selected_db;
|
||||||
var dbname = self.params.db || (dblist.length === 1 ? dblist[0] : null);
|
|
||||||
|
|
||||||
// if there is an error message in params, show it then forget it
|
// if there is an error message in params, show it then forget it
|
||||||
if (self.params.error_message) {
|
if (self.params.error_message) {
|
||||||
|
|
|
@ -45,10 +45,10 @@ openerp.portal_anonymous = function(instance) {
|
||||||
var self = this;
|
var self = this;
|
||||||
return $.when(this._super()).then(function() {
|
return $.when(this._super()).then(function() {
|
||||||
var dblist = self.db_list || [];
|
var dblist = self.db_list || [];
|
||||||
if (!self.session.session_is_valid() && dblist.length === 1 && !(self.params.token || self.params.login)) {
|
if (!self.session.session_is_valid() && !(self.params.token || self.params.login)) {
|
||||||
self.remember_credentials = false;
|
self.remember_credentials = false;
|
||||||
// XXX get login/pass from server (via a rpc call) ?
|
// XXX get login/pass from server (via a rpc call) ?
|
||||||
return self.do_login(dblist[0], 'anonymous', 'anonymous');
|
return self.do_login(self.selected_db, 'anonymous', 'anonymous');
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
},
|
},
|
||||||
|
@ -69,6 +69,7 @@ openerp.portal_anonymous = function(instance) {
|
||||||
var p = self.getParent();
|
var p = self.getParent();
|
||||||
var am = p.action_manager;
|
var am = p.action_manager;
|
||||||
p.$el.find('.oe_leftbar').hide();
|
p.$el.find('.oe_leftbar').hide();
|
||||||
|
self.session.session_logout().done(function () {
|
||||||
am.do_action({
|
am.do_action({
|
||||||
type:'ir.actions.client',
|
type:'ir.actions.client',
|
||||||
tag:'login',
|
tag:'login',
|
||||||
|
@ -80,6 +81,7 @@ openerp.portal_anonymous = function(instance) {
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue