[FIX] anonymous: use callback to reload client when logged in + only auto log if not logged
bzr revid: chs@openerp.com-20120802151408-q81m5l90rjfe8azd
This commit is contained in:
parent
19b50c4902
commit
6b23be4a25
|
@ -4,8 +4,8 @@ openerp.anonymous = function(instance) {
|
||||||
start: function() {
|
start: function() {
|
||||||
var self = this;
|
var self = this;
|
||||||
return $.when(this._super()).pipe(function() {
|
return $.when(this._super()).pipe(function() {
|
||||||
var dblist = self._db_list;
|
var dblist = self._db_list || [];
|
||||||
if (dblist && dblist.length === 1) {
|
if (!self.session.session_is_valid() && dblist.length === 1) {
|
||||||
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(dblist[0], 'anonymous', 'anonymous')
|
||||||
|
@ -30,8 +30,16 @@ openerp.anonymous = function(instance) {
|
||||||
var p = self.getParent();
|
var p = self.getParent();
|
||||||
var am = p.action_manager;
|
var am = p.action_manager;
|
||||||
p.$element.find('.oe_leftbar').hide();
|
p.$element.find('.oe_leftbar').hide();
|
||||||
am.do_action({type:'ir.actions.client', tag:'login', target: 'new'});
|
am.do_action({
|
||||||
am.dialog_widget.on('login', p, p.restart);
|
type:'ir.actions.client',
|
||||||
|
tag:'login',
|
||||||
|
target: 'new',
|
||||||
|
params: {
|
||||||
|
login_successful: function() {
|
||||||
|
am.do_action("reload");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
});
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue