diff options
| author | Olivier Dony <odo@openerp.com> | 2012-11-09 14:36:23 +0100 |
|---|---|---|
| committer | Olivier Dony <odo@openerp.com> | 2012-11-09 14:36:23 +0100 |
| commit | d47d5f202d8da18fac46dee9a9be6613d1ef8e2f (patch) | |
| tree | 703be521b4ca935d0e4375fc3e88b34558b282a3 /addons/auth_oauth | |
| parent | c9d5148991db5beccedc802ce56efb3689dd1527 (diff) | |
| parent | c5961309c424173953a67d873c79135a97856759 (diff) | |
[MERGE] Sync with trunk
bzr revid: odo@openerp.com-20121109133623-pvgt4b9koun74ib3
Diffstat (limited to 'addons/auth_oauth')
| -rw-r--r-- | addons/auth_oauth/static/src/js/auth_oauth.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js index 5c80d29f4e9..15683cfac2a 100644 --- a/addons/auth_oauth/static/src/js/auth_oauth.js +++ b/addons/auth_oauth/static/src/js/auth_oauth.js @@ -12,7 +12,7 @@ openerp.auth_oauth = function(instance) { } else if(this.params.oauth_error === 2) { this.do_warn("Authentication error",""); } - return d.then(this.do_oauth_load).fail(function() { + return d.done(this.do_oauth_load).fail(function() { self.do_oauth_load([]); }); }, @@ -23,7 +23,7 @@ openerp.auth_oauth = function(instance) { do_oauth_load: function() { var db = this.$("form [name=db]").val(); if (db) { - this.rpc("/auth_oauth/list_providers", { dbname: db }).then(this.on_oauth_loaded); + this.rpc("/auth_oauth/list_providers", { dbname: db }).done(this.on_oauth_loaded); } }, on_oauth_loaded: function(result) { |