Pman.Login.js

[Pman.Core] / Pman.Login.js

diff --git a/Pman.Login.js b/Pman.Login.js
index 76af8fd..0afdb68 100644 (file)
--- a/Pman.Login.js
+++ b/Pman.Login.js
@@ -153,7 +153,15 @@ Pman.Login =  new Roo.util.Observable({
         this.fillAuth(res.data);
         
         this.checkFails =0;
-        Pman.onload();
+        
+        
+        if (Pman.onload) { 
+            Pman.onload();
+        }
+        if (Pman.Login.callback) {
+            Pman.Login.callback();
+            
+        }
         return false;
     },
     
@@ -293,8 +301,9 @@ Pman.Login =  new Roo.util.Observable({
                     //act.result.errorMsg// invalid form element list...
                     
                     Pman.Login.dialog.el.unmask();
-                    Roo.MessageBox.alert("Error", act.result.errorMsg ? act.result.errorMsg : 
-                                "Login failed - communication error - try again.");
+                    var msg = act.result.errorMsg || act.result.message;
+                    msg = msg ||   "Login failed - communication error - try again.";
+                    Roo.MessageBox.alert("Error",  msg); 
                               
                 },
                 actioncomplete: function(re, act) {
@@ -308,10 +317,13 @@ Pman.Login =  new Roo.util.Observable({
                         //Roo.get('loading').show();
                         Roo.get('loading-mask').show();
                     }
-                   
-                    Pman.onload();
-                    
+                    if (Pman.onload) { 
+                        Pman.onload();
+                    }
+                    if (Pman.Login.callback) {
+                        Pman.Login.callback();
                      
+                    }
                     
                 }
             }
@@ -392,6 +404,10 @@ Pman.Login =  new Roo.util.Observable({
           
         this.form.render(ef.dom);
          // logoprefix comes from base config.
+         
+        var img = typeof(appLogo) != 'undefined' ? appLogo :
+            rootURL + '/Pman/'+appNameShort + '/templates/images/logo.gif' 
+         
         Pman.Login.form.el.createChild({
                 tag: 'img', 
                 src: rootURL + '/Pman/'+appNameShort + '/templates/images/logo.gif',
@@ -438,6 +454,9 @@ Pman.Login =  new Roo.util.Observable({
         if (this.disabled) {
             return;
         }
+        
+        
+        
         this.callback = cb; // used for non-pman usage..
         modal = modal || false;
         if (Pman.Login.authUserId < 0) { // logout!?
@@ -469,6 +488,11 @@ Pman.Login =  new Roo.util.Observable({
         this.dialog.el.unmask(); 
         this.resizeToLogo.defer(1000,this);
         
+        // if we have not created a provider.. do it now...
+        if (!Roo.state.Manager.getProvider().expires) { 
+            Roo.state.Manager.setProvider(new Roo.state.CookieProvider());
+        }
+         
          
         this.form.setValues({
             'username' : Roo.state.Manager.get('Pman.Login.username.'+appNameShort, ''),