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

[FIX] auth_signup: avoid getting login screen instead of signup when has correct invitation token due to concurrent calls (opw #598453) 

bzr revid: mat@openerp.com-20131118171656-j949pzklez13tfyt
This commit is contained in:
Martin Trigaux 2013-11-18 18:16:56 +01:00
parent d3e25aa5e9
commit b124712b57
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,12 +39,6 @@ openerp.auth_signup = function(instance) {
delete self.params.error_message;
}
// in case of a signup, retrieve the user information from the token
if (dbname && self.params.token) {
self.rpc("/auth_signup/retrieve", {dbname: dbname, token: self.params.token})
.done(self.on_token_loaded)
.fail(self.on_token_failed);
}
if (dbname && self.params.login) {
self.$("form input[name=login]").val(self.params.login);
}
@ -53,7 +47,7 @@ openerp.auth_signup = function(instance) {
self.$('a.oe_signup_reset_password').click(self.do_reset_password);
if (dbname) {
self.rpc("/auth_signup/get_config", {dbname: dbname}).done(function(result) {
self.rpc("/auth_signup/get_config", {dbname: dbname}).then(function(result) {
self.signup_enabled = result.signup;
self.reset_password_enabled = result.reset_password;
if (!self.signup_enabled || self.$("form input[name=login]").val()){
@ -61,6 +55,13 @@ openerp.auth_signup = function(instance) {
} else {
self.set('login_mode', 'signup');
}
// in case of a signup, retrieve the user information from the token
if (self.params.token) {
self.rpc("/auth_signup/retrieve", {dbname: dbname, token: self.params.token})
.then(self.on_token_loaded, self.on_token_failed);
}
});
} else {
// TODO: support multiple database mode