[open-ils-commits] r9942 - in branches/acq-experiment: . Open-ILS/web/js/dojo/openils

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-06-26 15:37:14 -0400 (Thu, 26 Jun 2008)
New Revision: 9942

Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js
Log:
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
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-9935
   + /trunk:1-9941

Modified: branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js	2008-06-26 19:36:57 UTC (rev 9941)
+++ branches/acq-experiment/Open-ILS/web/js/dojo/openils/User.js	2008-06-26 19:37:14 UTC (rev 9942)
@@ -47,7 +47,6 @@
             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 @@
             } 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 @@
     
             initReq.oncomplete = function(r) {
                 var seed = r.recv().content(); 
-                alert(seed);
                 var loginInfo = {
                     username : args.username,
                     password : hex_md5(seed + hex_md5(args.passwd)),