From 97698c02b0bde63f5ee5c4f8777121bd2b463979 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 28 Feb 2013 17:33:19 +0100 Subject: [PATCH 1/5] [FIX] Fix modules for monodb login bzr revid: fme@openerp.com-20130228163319-lyu985ueqj7xpr6u --- .../auth_signup/static/src/js/auth_signup.js | 3 +-- .../static/src/js/portal_anonymous.js | 22 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/addons/auth_signup/static/src/js/auth_signup.js b/addons/auth_signup/static/src/js/auth_signup.js index 6757b9cb69d..97c647a3e28 100644 --- a/addons/auth_signup/static/src/js/auth_signup.js +++ b/addons/auth_signup/static/src/js/auth_signup.js @@ -29,8 +29,7 @@ openerp.auth_signup = function(instance) { return false; }); - var dblist = self.db_list || []; - var dbname = self.params.db || (dblist.length === 1 ? dblist[0] : null); + var dbname = self.selected_db; // if there is an error message in params, show it then forget it if (self.params.error_message) { diff --git a/addons/portal_anonymous/static/src/js/portal_anonymous.js b/addons/portal_anonymous/static/src/js/portal_anonymous.js index 10a53418c59..c408936720c 100644 --- a/addons/portal_anonymous/static/src/js/portal_anonymous.js +++ b/addons/portal_anonymous/static/src/js/portal_anonymous.js @@ -45,10 +45,10 @@ openerp.portal_anonymous = function(instance) { var self = this; return $.when(this._super()).then(function() { var dblist = self.db_list || []; - if (!self.session.session_is_valid() && dblist.length === 1 && !(self.params.token || self.params.login)) { + if (!self.session.session_is_valid() && !(self.params.token || self.params.login)) { self.remember_credentials = false; // XXX get login/pass from server (via a rpc call) ? - return self.do_login(dblist[0], 'anonymous', 'anonymous'); + return self.do_login(self.selected_db, 'anonymous', 'anonymous'); } }); }, @@ -69,15 +69,17 @@ openerp.portal_anonymous = function(instance) { var p = self.getParent(); var am = p.action_manager; p.$el.find('.oe_leftbar').hide(); - am.do_action({ - type:'ir.actions.client', - tag:'login', - target: 'current', - params: { - login_successful: function() { - am.do_action("reload"); + self.session.session_logout().done(function () { + am.do_action({ + type:'ir.actions.client', + tag:'login', + target: 'current', + params: { + login_successful: function() { + am.do_action("reload"); + } } - } + }); }); }); } From 3ebe708abf58e7889e47d564376fd437a828f3c8 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 5 Mar 2013 10:24:55 +0100 Subject: [PATCH 2/5] [FIX] Api change for db_monodb bzr revid: fme@openerp.com-20130305092455-fny0mh1g5kamusnl --- addons/auth_oauth/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 1c38f7f4eae..878eb292a63 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -90,7 +90,7 @@ class OAuthController(oeweb.Controller): """login user via OpenERP Account provider""" dbname = kw.pop('db', None) if not dbname: - dbname = db_monodb(req) + dbname = db_monodb(req)[0] if not dbname: return BadRequest() From f1b8f7411d79caf579f11880378b724cd7a7b438 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 5 Mar 2013 12:17:19 +0100 Subject: [PATCH 3/5] [FIX] unbreak api bzr revid: fme@openerp.com-20130305111719-ja4u3hpqfrj3amqu --- addons/auth_oauth/controllers/main.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/auth_oauth/controllers/main.py b/addons/auth_oauth/controllers/main.py index 878eb292a63..1c38f7f4eae 100644 --- a/addons/auth_oauth/controllers/main.py +++ b/addons/auth_oauth/controllers/main.py @@ -90,7 +90,7 @@ class OAuthController(oeweb.Controller): """login user via OpenERP Account provider""" dbname = kw.pop('db', None) if not dbname: - dbname = db_monodb(req)[0] + dbname = db_monodb(req) if not dbname: return BadRequest() From 8bb8ebba362075c4ebac5c33f1980fc64bd234e1 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Tue, 5 Mar 2013 17:40:22 +0100 Subject: [PATCH 4/5] [IMP] portal anonymous, hide top bar when clicking Login button bzr revid: fme@openerp.com-20130305164022-p177nfhajihhm9l6 --- addons/portal_anonymous/static/src/js/portal_anonymous.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/portal_anonymous/static/src/js/portal_anonymous.js b/addons/portal_anonymous/static/src/js/portal_anonymous.js index c408936720c..8a217f03b3d 100644 --- a/addons/portal_anonymous/static/src/js/portal_anonymous.js +++ b/addons/portal_anonymous/static/src/js/portal_anonymous.js @@ -68,7 +68,7 @@ openerp.portal_anonymous = function(instance) { this.$el.find('a.login').click(function() { var p = self.getParent(); var am = p.action_manager; - p.$el.find('.oe_leftbar').hide(); + p.$el.find('.oe_leftbar, .oe_topbar').hide(); self.session.session_logout().done(function () { am.do_action({ type:'ir.actions.client', From 8b90f3d814d903678abc36dc94652d30d9fd6cf2 Mon Sep 17 00:00:00 2001 From: Fabien Meghazi Date: Thu, 7 Mar 2013 09:35:07 +0100 Subject: [PATCH 5/5] [REM] Remove unused code bzr revid: fme@openerp.com-20130307083507-3v0kp0oyms4v09tn --- addons/portal_anonymous/static/src/js/portal_anonymous.js | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/portal_anonymous/static/src/js/portal_anonymous.js b/addons/portal_anonymous/static/src/js/portal_anonymous.js index 8a217f03b3d..a719a285908 100644 --- a/addons/portal_anonymous/static/src/js/portal_anonymous.js +++ b/addons/portal_anonymous/static/src/js/portal_anonymous.js @@ -44,7 +44,6 @@ openerp.portal_anonymous = function(instance) { start: function() { var self = this; return $.when(this._super()).then(function() { - var dblist = self.db_list || []; if (!self.session.session_is_valid() && !(self.params.token || self.params.login)) { self.remember_credentials = false; // XXX get login/pass from server (via a rpc call) ?