Pman.Dialog.Login.bjs

Pman.Dialog.Login.js

diff --git a/Pman.Dialog.Login.bjs b/Pman.Dialog.Login.bjs
index 51bf5ae..c6edd54 100644 (file)
--- a/Pman.Dialog.Login.bjs
+++ b/Pman.Dialog.Login.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.Login",
  "parent" : "",
  "title" : "",
- "path" : "/home/johns/gitlive/Pman.BAdmin/Pman.Dialog.Login.bjs",
+ "path" : "/home/edward/gitlive/Pman.BAdmin/Pman.Dialog.Login.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -55,9 +55,9 @@
            "items" : [
             {
              "listeners" : {
+              "|actioncomplete" : "function (_self, action) {\n    \n    if(action.type == 'setdata'){\n\n        if(\n            _this.lastLogin && \n            _this.lastLogin.login_provider == ''\n        ){\n            _this.form.findField('username').setValue(_this.lastLogin.email);\n        }\n        \n        Roo.get('login-err').dom.innerHTML = \"\";\n        _this.dialog.el.select('.modal-content', true).first().unmask();\n        this.clearInvalid();\n        return;\n    }\n     \n    if(action.type == 'load'){\n        \n        return;\n    }\n    \n    if (action.type =='submit') {\n    \n        _this.dialog.hide();\n    \n        if (_this.callback) {\n            _this.callback.call(_this, action.result);\n         }\n         \n         _this.form.reset();\n         \n         return;\n    }\n}",
               "|render" : "function (_self) {\n    _this.form = _self;\n}",
-              "|actionfailed" : "function (_self, action) {\n    Roo.log('action failed?!');\n    Roo.log(action);\n    \n    _this.dialog.el.select('.modal-content', true).first().unmask();\n    \n    if (typeof(action) != 'undefined' && action.failureType == 'server') {\n    \n        if(action.result.errorMsg == 'Authenticated'){\n            var data = Roo.apply(action.result.errors);\n            \n            data.target = _this.form.findField('username').getValue();\n            \n            Roo.bootstrap.MessageBox.alert(\"Error\", \"odd error messages\")\n            \n        }\n        \n        Roo.get('login-err').dom.innerHTML = action.result.errorMsg;\n        return;\n    }\n    \n    Roo.get('login-err').dom.innerHTML = \"Fill in all the required fields\";\n}",
-              "|actioncomplete" : "function (_self, action) {\n    \n    if(action.type == 'setdata'){\n\n        if(\n            _this.lastLogin && \n            _this.lastLogin.login_provider == ''\n        ){\n            _this.form.findField('username').setValue(_this.lastLogin.email);\n        }\n        \n        Roo.get('login-err').dom.innerHTML = \"\";\n        _this.dialog.el.select('.modal-content', true).first().unmask();\n        this.clearInvalid();\n        return;\n    }\n     \n    if(action.type == 'load'){\n        \n        return;\n    }\n    \n    if (action.type =='submit') {\n    \n        _this.dialog.hide();\n    \n        if (_this.callback) {\n            _this.callback.call(_this, action.result);\n         }\n         \n         _this.form.reset();\n         \n         return;\n    }\n}"
+              "|actionfailed" : "function (_self, action) {\n    Roo.log('action failed?!');\n    Roo.log(action);\n    \n    _this.dialog.el.select('.modal-content', true).first().unmask();\n    \n    if (typeof(action) != 'undefined' && action.failureType == 'server') {\n        \n        switch (action.result.errorMsg) {\n                    \n                    case 'Authenticated' :\n                        \n                        var data = Roo.apply(action.result.errors);\n                        \n                        data.target = _this.form.findField('username').getValue();\n                        \n                        Roo.bootstrap.MessageBox.alert(\"Error\", \"odd error messages\")\n                        \n                        return;\n                        \n                    case 'NEW-IP-ADDRESS' :\n                    case 'PENDING-IP-ADDRESS' :\n                    case 'BAD-IP-ADDRESS' :\n                    case 'BLOCKED-IP-ADDRESS' :\n                        \n                        Pman.Dialog.LoginNotice.show({\n                            status : action.result.errorMsg,\n                            ip : action.result.errors.ip\n                        });\n                        \n                        return;\n                        \n                    default:\n                        break;\n                }\n                \n        \n        \n        Roo.get('login-err').dom.innerHTML = action.result.errorMsg;\n        return;\n    }\n    \n    Roo.get('login-err').dom.innerHTML = \"Fill in all the required fields\";\n}"
              },
              "$ url" : "baseURL + '/Login'",
              "labelAlign" : "left",
@@ -76,8 +76,8 @@
                   "specialkey" : "function (_self, e)\n{\n    if(e.getKey() == 13){\n        _this.dialog.el.select('.modal-content', true).first().mask('Sending...');\n        _this.form.doAction('submit');\n    }\n    \n}"
                  },
                  "inputType" : "email",
-                 "xtype" : "Input",
                  "vtype" : "email",
+                 "xtype" : "Input",
                  "placeholder" : "Email Address",
                  "allowBlank" : false,
                  "$ xns" : "Roo.bootstrap",
@@ -88,8 +88,8 @@
                   "specialkey" : "function (_self, e)\n{\n    if(e.getKey() == 13){\n        _this.dialog.el.select('.modal-content', true).first().mask('Sending...');\n        _this.form.doAction('submit');\n    }\n}"
                  },
                  "inputType" : "password",
-                 "placeholder" : "Password",
                  "xtype" : "Input",
+                 "placeholder" : "Password",
                  "allowBlank" : false,
                  "$ xns" : "Roo.bootstrap",
                  "name" : "password"
@@ -146,8 +146,8 @@
     },
     {
      "xtype" : "Button",
-     "$ string weight" : "'primary'",
      "html" : "Login",
+     "$ string weight" : "'primary'",
      "$ xns" : "Roo.bootstrap",
      "String style" : "float: right",
      "* prop" : "buttons[]",

diff --git a/Pman.Dialog.Login.js b/Pman.Dialog.Login.js
index 6d0e7b4..37de124 100644 (file)
--- a/Pman.Dialog.Login.js
+++ b/Pman.Dialog.Login.js
@@ -206,15 +206,36 @@ Roo.apply(Pman.Dialog.Login.prototype, {
                     _this.dialog.el.select('.modal-content', true).first().unmask();
                     
                     if (typeof(action) != 'undefined' && action.failureType == 'server') {
-                    
-                        if(action.result.errorMsg == 'Authenticated'){
-                            var data = Roo.apply(action.result.errors);
-                            
-                            data.target = _this.form.findField('username').getValue();
-                            
-                            Roo.bootstrap.MessageBox.alert("Error", "odd error messages")
-                            
-                        }
+                        
+                        switch (action.result.errorMsg) {
+                                    
+                                    case 'Authenticated' :
+                                        
+                                        var data = Roo.apply(action.result.errors);
+                                        
+                                        data.target = _this.form.findField('username').getValue();
+                                        
+                                        Roo.bootstrap.MessageBox.alert("Error", "odd error messages")
+                                        
+                                        return;
+                                        
+                                    case 'NEW-IP-ADDRESS' :
+                                    case 'PENDING-IP-ADDRESS' :
+                                    case 'BAD-IP-ADDRESS' :
+                                    case 'BLOCKED-IP-ADDRESS' :
+                                        
+                                        Pman.Dialog.LoginNotice.show({
+                                            status : action.result.errorMsg,
+                                            ip : action.result.errors.ip
+                                        });
+                                        
+                                        return;
+                                        
+                                    default:
+                                        break;
+                                }
+                                
+                        
                         
                         Roo.get('login-err').dom.innerHTML = action.result.errorMsg;
                         return;