Pman.Dialog.BAdminStaff.bjs

Pman.Dialog.BAdminStaff.js

diff --git a/Pman.Dialog.BAdminStaff.bjs b/Pman.Dialog.BAdminStaff.bjs
index bb53493..e362c5e 100644 (file)
--- a/Pman.Dialog.BAdminStaff.bjs
+++ b/Pman.Dialog.BAdminStaff.bjs
@@ -27,6 +27,18 @@
   "acf45fd8829f809b29c601a3a193804f" : "Set / Change Password",
   "01028205a11cf95a503c4c1d005989da" : "Generate One"
  },
+ "named_strings" : {
+  "email_placeholder" : "ce8ae9da5b7cd6c3df2929543a9af92d",
+  "secure_passwords_boxLabel" : "0bfe42db3eb05bf39f03812166391939",
+  "name_placeholder" : "49ee3087348e8d44e1feda1917443987",
+  "role_fieldLabel" : "bbbabdbe1b262f75d99d62880b953be1",
+  "name_fieldLabel" : "49ee3087348e8d44e1feda1917443987",
+  "role_placeholder" : "bbbabdbe1b262f75d99d62880b953be1",
+  "phone_fieldLabel" : "bcc254b55c4a1babdf1dcb82c207506b",
+  "_enable_oath_key_boxLabel" : "828e70f83623b262e14187c039df99c0",
+  "email_fieldLabel" : "ce8ae9da5b7cd6c3df2929543a9af92d",
+  "passwd2_placeholder" : "6f958ddaf50fd5ade7858ef1d1a63e51"
+ },
  "items" : [
   {
    "listeners" : {
@@ -75,12 +87,12 @@
          "items" : [
           {
            "listeners" : {
-            "actioncomplete" : "function (_self, action)\n{\n    if(action.type == 'setdata'){\n        \n        _this.layout.showPanel('DetailPanel');\n        \n        _this.dialog.setTitle(\"Add / Edit User\");\n        _this.form.findField('role').setDisabled(false);\n            \n        /*\n        * Use for init -- Call from Pman.Login.js\n        */\n        if(typeof(_this.data.role) != 'undefined' && _this.data.role == 'Administrators') {\n            _this.dialog.setTitle(\"Create Adminstrator\");\n            _this.form.findField('role').setDisabled(true);\n        }\n        \n        _this.form.findField('passwd1').el.select('input',true).first().dom.type=\"password\";\n        _this.form.findField('passwd2').show();\n        _this.passwordbox.collapse();\n        \n        _this.qrCodeBox.collapse();\n        _this.qrCodeBox.el.hide();\n        _this.form.findField('_enable_oath_key').setValue(1);\n        _this.form.findField('_enable_oath_key').el.show();\n        \n        _this.generate_qrcode_btn.el.hide();\n        _this.delete_qrcode_btn.el.hide();\n        _this.show_qrcode_btn.el.hide();\n        \n        if(_this.data.id * 1 > 0) {\n            this.doAction('load',{ method: 'GET', params: { '_id' : _this.data.id }});\n        }\n        \n        this.clearInvalid();\n        \n        return;\n    }\n   \n    if (action.type == 'load') {\n    \n        _this.data = action.result.data;\n        \n        _this.qrCodeBox.el.show();\n        _this.form.findField('_enable_oath_key').setValue(0);\n        _this.form.findField('_enable_oath_key').el.hide();\n        \n        _this.generate_qrcode_btn.el.show();\n        _this.delete_qrcode_btn.el.hide();\n        _this.show_qrcode_btn.el.hide();\n            \n        _this.qrCodeBox.collapse();\n        \n        if(_this.data.length_oath_key * 1 > 0){\n            _this.delete_qrcode_btn.el.show();\n            _this.show_qrcode_btn.el.show();\n            _this.qrCodeBox.expand();\n        }\n        \n        return;\n    }\n    \n    if (action.type == 'submit') { // only submitted here if we are \n    \n        _this.dialog.hide();\n       \n        if (_this.callback) {\n            _this.callback.call(this, action.result.data);\n        }\n        \n        return;\n        \n    }\n}",
+            "actioncomplete" : "function (_self, action)\n{\n    if(action.type == 'setdata'){\n        \n        _this.layout.showPanel('DetailPanel');\n        \n        _this.dialog.setTitle(\"Add / Edit User\");\n        _this.form.findField('role').setDisabled(false);\n            \n        /*\n        * Use for init -- Call from Pman.Login.js\n        */\n        if(typeof(_this.data.role) != 'undefined' && _this.data.role == 'Administrators') {\n            _this.dialog.setTitle(\"Create Adminstrator\");\n            _this.form.findField('role').setDisabled(true);\n        }\n        \n        _this.form.findField('passwd1').el.select('input',true).first().dom.type=\"password\";\n        _this.form.findField('passwd2').show();\n        _this.passwordbox.collapse();\n        \n        _this.qrCodeBox.collapse();\n        _this.qrCodeBox.el.hide();\n        _this.form.findField('_enable_oath_key').setValue(1);\n        _this.form.findField('_enable_oath_key').el.show();\n        \n        _this.generate_qrcode_btn.el.hide();\n        _this.delete_qrcode_btn.el.hide();\n        _this.show_qrcode_btn.el.hide();\n        \n        if(_this.data.id * 1 > 0) {\n            this.doAction('load',{ method: 'GET', params: { '_id' : _this.data.id }});\n        }\n        \n        this.clearInvalid();\n        \n        return;\n    }\n   \n    if (action.type == 'load') {\n    \n        _this.data = action.result.data;\n        \n        _this.qrCodeBox.el.show();\n        _this.form.findField('_enable_oath_key').setValue(0);\n        _this.form.findField('_enable_oath_key').el.hide();\n        \n        _this.generate_qrcode_btn.el.show();\n        _this.delete_qrcode_btn.el.hide();\n        _this.show_qrcode_btn.el.hide();\n            \n        _this.qrCodeBox.collapse();\n        \n        if(_this.data.length_oath_key * 1 > 0){\n            _this.delete_qrcode_btn.el.show();\n            _this.show_qrcode_btn.el.show();\n            _this.qrCodeBox.expand();\n        }\n        \n        _this.dialog.resize();\n        \n        return;\n    }\n    \n    if (action.type == 'submit') { // only submitted here if we are \n    \n        _this.dialog.hide();\n       \n        if (_this.callback) {\n            _this.callback.call(this, action.result.data);\n        }\n        \n        return;\n        \n    }\n}",
             "render" : "function (_self)\n{\n    _this.form = _self;\n    \n}"
            },
            "$ url" : "baseURL + '/Roo/core_person' ",
-           "style" : "margin-top: 20px;",
            "xtype" : "Form",
+           "style" : "margin-top: 20px;",
            "String labelAlign" : "top",
            "$ xns" : "Roo.bootstrap",
            "string errorMask" : true,

diff --git a/Pman.Dialog.BAdminStaff.js b/Pman.Dialog.BAdminStaff.js
index ba360d6..73b2fb4 100644 (file)
--- a/Pman.Dialog.BAdminStaff.js
+++ b/Pman.Dialog.BAdminStaff.js
@@ -272,6 +272,8 @@ Roo.apply(Pman.Dialog.BAdminStaff.prototype, {
                           _this.qrCodeBox.expand();
                       }
                       
+                      _this.dialog.resize();
+                      
                       return;
                   }