summaryrefslogtreecommitdiff
path: root/addons/auth_oauth/static/src
diff options
context:
space:
mode:
authorFabien Meghazi <fme@openerp.com>2013-03-28 09:47:28 +0100
committerFabien Meghazi <fme@openerp.com>2013-03-28 09:47:28 +0100
commite43b87787615d85a98c837bf870e54ae96fdd05b (patch)
tree3bf2beb535a5259e991f2ec1c7a428b6cdc58780 /addons/auth_oauth/static/src
parentfc04522286417198e1f19b010cbacd02f56f1c3b (diff)
[IMP] Hide login box on oauth auto signin
bzr revid: fme@openerp.com-20130328084728-sofa4z0wxf9x8jnf
Diffstat (limited to 'addons/auth_oauth/static/src')
-rw-r--r--addons/auth_oauth/static/src/js/auth_oauth.js6
1 files changed, 5 insertions, 1 deletions
diff --git a/addons/auth_oauth/static/src/js/auth_oauth.js b/addons/auth_oauth/static/src/js/auth_oauth.js
index 7ee83bd99e9..131ae5c1c42 100644
--- a/addons/auth_oauth/static/src/js/auth_oauth.js
+++ b/addons/auth_oauth/static/src/js/auth_oauth.js
@@ -5,6 +5,7 @@ openerp.auth_oauth = function(instance) {
start: function(parent, params) {
var self = this;
var d = this._super.apply(this, arguments);
+ this.$el.hide();
this.$el.on('click', 'a.zocial', this.on_oauth_sign_in);
this.oauth_providers = [];
if(this.params.oauth_error === 1) {
@@ -24,6 +25,8 @@ openerp.auth_oauth = function(instance) {
var db = this.$("form [name=db]").val();
if (db) {
this.rpc("/auth_oauth/list_providers", { dbname: db }).done(this.on_oauth_loaded);
+ } else {
+ this.$el.show();
}
},
on_oauth_loaded: function(result) {
@@ -32,6 +35,7 @@ openerp.auth_oauth = function(instance) {
if (this.oauth_providers.length === 1 && params.type === 'signup') {
this.do_oauth_sign_in(this.oauth_providers[0]);
} else {
+ this.$el.show();
this.$('.oe_oauth_provider_login_button').remove();
var buttons = QWeb.render("auth_oauth.Login.button",{"widget":this});
this.$(".oe_login_pane form ul").after(buttons);
@@ -57,7 +61,7 @@ openerp.auth_oauth = function(instance) {
state: JSON.stringify(state),
};
var url = provider.auth_endpoint + '?' + $.param(params);
- window.location = url;
+ instance.web.redirect(url);
},
_oauth_state: function(provider) {
// return the state object sent back with the redirected uri