From a84045ecabcbf14b426772629f9cfaf7ed2fdc0f Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Tue, 1 May 2012 14:23:10 +0530
Subject: [PATCH] logout fix

---
 js/core.min.js   | 2 +-
 js/wn/request.js | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/js/core.min.js b/js/core.min.js
index 34a75850d4..c767d410e6 100644
--- a/js/core.min.js
+++ b/js/core.min.js
@@ -379,7 +379,7 @@ me.list.run();});this.dialog.show();},add_column:function(c){var w=$('<div style
  */
 wn.provide('wn.request');wn.request.url='index.cgi';wn.request.prepare=function(opts){if(opts.btn)$(opts.btn).set_working();if(opts.show_spinner)set_loading();if(opts.freeze)freeze();if(!opts.args.cmd){console.log(opts)
 throw"Incomplete Request";}}
-wn.request.cleanup=function(opts,r){if(opts.btn)$(opts.btn).done_working();if(opts.show_spinner)hide_loading();if(opts.freeze)unfreeze();if(wn.boot.sid&&wn.get_cookie('sid')!=wn.boot.sid){msgprint('Session expired');setTimeout('wn.app.redirect_to_login()',3000);return;}
+wn.request.cleanup=function(opts,r){if(opts.btn)$(opts.btn).done_working();if(opts.show_spinner)hide_loading();if(opts.freeze)unfreeze();if(wn.boot.sid&&wn.get_cookie('sid')!=wn.boot.sid){msgprint('Session Expired. Logging you out');wn.app.logout();return;}
 if(r.server_messages)msgprint(r.server_messages)
 if(r.exc){console.log(r.exc);};if(r['403']){wn.container.change_to('403');}
 if(r.docs)LocalDB.sync(r.docs);}
diff --git a/js/wn/request.js b/js/wn/request.js
index c2d292e52e..ab61f8c201 100644
--- a/js/wn/request.js
+++ b/js/wn/request.js
@@ -55,8 +55,8 @@ wn.request.cleanup = function(opts, r) {
 
 	// session expired?
 	if(wn.boot.sid && wn.get_cookie('sid') != wn.boot.sid) { 
-		msgprint('Session expired');
-		setTimeout('wn.app.redirect_to_login()', 3000); 
+		msgprint('Session Expired. Logging you out');
+		wn.app.logout();
 		return;
 	}