diff options
| author | Olivier Dony <odo@openerp.com> | 2013-11-20 15:43:18 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2013-11-20 15:43:18 +0100 |
| commit | 44664076dadd1676f6e6f528b7fc59f810aaf5c6 (patch) | |
| tree | c00b2f60f57ad4d2df474ec13a156e45abe36bec /addons/auth_signup/static | |
| parent | f534c7e3f2dc8bff7ebff27ad8c94c0353ea9f58 (diff) | |
| parent | 5a0e603589d2c07045eb64452a52f117f93d1292 (diff) | |
[MERGE] Forward-port of latest 7.0 fixes up to rev 9618 rev-id: dle@openerp.com-20131120142131-s333lyva85cyn41o
bzr revid: odo@openerp.com-20131120144059-yyh7emvgdarff09b
bzr revid: odo@openerp.com-20131120144318-11nmn1zj00zmi10z
Diffstat (limited to 'addons/auth_signup/static')
| -rw-r--r-- | addons/auth_signup/static/src/js/auth_signup.js | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index b825d683099..d9edb44d65f 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -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 |