From 502d0eb58f88ed76ec090dfbef77f79e0ea7882b Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Fri, 18 Mar 2011 13:19:44 +0100
Subject: [PATCH] [FIX] continuation of session_invalid should be added to
 on_login_valid (once we *do* have a valid session), not on Login.on_submit
 (where we don't yet have it)

bzr revid: xmo@openerp.com-20110318121944-xrgpha19glgmtc7o
---
 addons/base/static/openerp/js/base_chrome.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/addons/base/static/openerp/js/base_chrome.js b/addons/base/static/openerp/js/base_chrome.js
index 2392ec3250e..0870f92a38c 100644
--- a/addons/base/static/openerp/js/base_chrome.js
+++ b/addons/base/static/openerp/js/base_chrome.js
@@ -171,7 +171,7 @@ openerp.base.Session = openerp.base.BasicController.extend({
                     if (response.error.data.type == "session_invalid") {
                         self.uid = false;
                         self.on_session_invalid(function() {
-                            self.rpc(url, payload, success_callback, error_callback);
+                            self.rpc(url, payload.params, success_callback, error_callback);
                         });
                     } else {
                         error_callback(response.error);
@@ -351,13 +351,11 @@ openerp.base.Login =  openerp.base.Controller.extend({
     },
     do_ask_login: function(continuation) {
         this.on_login_invalid();
-        this.on_submit.add({
+        this.on_login_valid.add({
             position: "last",
             unique: true,
-            callback: function() {
-                if(continuation) continuation();
-                return false;
-            }});
+            callback: continuation
+        });
     }
 });