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

[FIX] Fix modules for monodb login 

bzr revid: fme@openerp.com-20130228163319-lyu985ueqj7xpr6u
This commit is contained in:
Fabien Meghazi 2013-02-28 17:33:19 +01:00
parent be867174aa
commit 97698c02b0
2 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
addons/auth_signup/static/src/js/auth_signup.js
View File

@ -29,8 +29,7 @@ openerp.auth_signup = function(instance) {
return false;
});
var dblist = self.db_list || [];
var dbname = self.params.db || (dblist.length === 1 ? dblist[0] : null);
var dbname = self.selected_db;
// if there is an error message in params, show it then forget it
if (self.params.error_message) {

22
addons/portal_anonymous/static/src/js/portal_anonymous.js
View File

@ -45,10 +45,10 @@ openerp.portal_anonymous = function(instance) {
var self = this;
return $.when(this._super()).then(function() {
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;
// 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,15 +69,17 @@ openerp.portal_anonymous = function(instance) {
var p = self.getParent();
var am = p.action_manager;
p.$el.find('.oe_leftbar').hide();
am.do_action({
type:'ir.actions.client',
tag:'login',
target: 'current',
params: {
login_successful: function() {
am.do_action("reload");
self.session.session_logout().done(function () {
am.do_action({
type:'ir.actions.client',
tag:'login',
target: 'current',
params: {
login_successful: function() {
am.do_action("reload");
}
}
}
});
});
});
}