diff options
| author | RGA(OpenERP) <> | 2012-11-09 10:57:43 +0530 |
|---|---|---|
| committer | RGA(OpenERP) <> | 2012-11-09 10:57:43 +0530 |
| commit | aa8a73cebb4b0975b85e3d48024f41bb59bf031b (patch) | |
| tree | 5a0f5e940a04d4c47cb726d68f6c8141c2ed44d8 /addons/auth_oauth/static/src/js/auth_oauth.js | |
| parent | 9accfe4e93409967756ec1a17c308017c82e482a (diff) | |
| parent | 0528e00788a7cca36353a2996ab58568bdd8be78 (diff) | |
Merge with trunk
bzr revid: rgaopenerp-20121109052743-v8ts1k78k37dfgpx
Diffstat (limited to 'addons/auth_oauth/static/src/js/auth_oauth.js')
| -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) { |