Changeset 9435

Timestamp:

04/22/08 22:03:48 (3 weeks ago)

Author:

miker

Message:

back-compat global population

Files:

• trunk/Open-ILS/web/js/dojo/openils/User.js (modified) (4 diffs)

trunk/Open-ILS/web/js/dojo/openils/User.js

@@ -36 +36 @@
             this.id = kwargs.id;
             this.user = kwargs.user;
-            this.authtoken = kwargs.authtoken;
-            this.authtime = kwargs.authtime;
+            this.passwd = kwargs.passwd;
+            this.authtoken = kwargs.authtoken || openils.User.authtoken;
+            this.authtime = kwargs.authtime || openils.User.authtime;
             this.login_type = kwargs.login_type;
             this.location = kwargs.location;
 
-            if (this.id && this.authtoken) this.getById();
-            else if (this.authtoken) this.getBySession();
+            if (this.authtoken) this.getBySession();
+            else if (this.id && this.authtoken) this.user = this.getById( this.id );
             else if (kwargs.login) this.login();
 
@@ -54 +55 @@
                     var user = r.recv().content();
                     _u.user = user;
+                                        if (!openils.User.user) !openils.User.user = _u.user;
                     if(onComplete)
                         onComplete(user);
@@ -108 +110 @@
                     var data = rr.recv().content();
                     _u.authtoken = data.payload.authtoken;
+                                        if (!openils.User.authtoken) !openils.User.authtoken = _u.authtoken;
                     _u.authtime = data.payload.authtime;
+                                        if (!openils.User.authtime) !openils.User.authtime = _u.authtime;
                     _u.getBySession(onComplete);
                 }
@@ -200 +204 @@
 
     });
+
+        openils.User.user = null;
+        openils.User.authtoken = null;
+        openils.User.authtime = null;
+
 }