From: erickson <erickson@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Thu, 26 Jun 2008 19:37:14 +0000 (+0000)
Subject: Merged revisions 9941 via svnmerge from
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=1d29381e3d3f46153c4278c58fa6dfbe8f19b66b;p=Evergreen.git

Merged revisions 9941 via svnmerge from
svn://svn.open-ils.org/ILS/trunk

........
  r9941 | erickson | 2008-06-26 15:36:57 -0400 (Thu, 26 Jun 2008) | 1 line

  setting globl .user var if not already set.  removed debug alert
........


git-svn-id: svn://svn.open-ils.org/ILS/branches/acq-experiment@9942 dcc99617-32d9-48b4-a31d-7c20da2025e4
---

diff --git a/Open-ILS/web/js/dojo/openils/User.js b/Open-ILS/web/js/dojo/openils/User.js
index f7cce56ead..8dd7b446c8 100644
--- a/Open-ILS/web/js/dojo/openils/User.js
+++ b/Open-ILS/web/js/dojo/openils/User.js
@@ -47,7 +47,6 @@ if(!dojo._hasResource["openils.User"]) {
             if (this.id && this.authtoken) this.user = this.getById( this.id );
             else if (this.authtoken) this.getBySession();
             else if (kwargs.login) this.login();
-
         },
 
         getBySession : function(onComplete) {
@@ -65,7 +64,9 @@ if(!dojo._hasResource["openils.User"]) {
             } else {
                 req.timeout = 10;
                 req.send();
-                return _u.user = req.recv().content();
+                _u.user = req.recv().content();
+				if (!openils.User.user) openils.User.user = _u.user;
+                return _u.user;
             }
         },
     
@@ -101,7 +102,6 @@ if(!dojo._hasResource["openils.User"]) {
     
             initReq.oncomplete = function(r) {
                 var seed = r.recv().content(); 
-                alert(seed);
                 var loginInfo = {
                     username : args.username,
                     password : hex_md5(seed + hex_md5(args.passwd)),