From: Edward <edward@roojs.com>
Date: Fri, 7 Dec 2018 04:00:17 +0000 (+0800)
Subject: Pman.Tab.BAdminStaff.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.BAdmin;a=commitdiff_plain;h=265399cfcc9d865a96b490e9c7f73ddbb28d6be5

Pman.Tab.BAdminStaff.bjs
Pman.Tab.BAdminStaff.js
---

diff --git a/Pman.Tab.BAdminStaff.bjs b/Pman.Tab.BAdminStaff.bjs
index 75759920..8a4acb54 100644
--- a/Pman.Tab.BAdminStaff.bjs
+++ b/Pman.Tab.BAdminStaff.bjs
@@ -111,7 +111,7 @@
                    "items" : [
                     {
                      "listeners" : {
-                      "click" : "function (_self, e)\n{\n    Pman.Dialog.BAdminStaff.show({ \n        id : 0,\n        company_id : Pman.Login.authUser.company_id\n    }, function(res) {\n    \n        if(res.length_oath_key * 1 < 1){\n            _this.member_grid.footer.onClick('first');\n            return;\n        }\n        \n        Pman.Dialog.BAdminStaffTwoFactorQRCode.show({\n            id : res.id\n        }, function(res){\n            _this.member_grid.footer.onClick('first');\n        });\n    }); \n\n}"
+                      "click" : "function (_self, e)\n{\n    Pman.Dialog.BAdminStaff.show({ \n        id : 0,\n        company_id : Pman.Login.authUser.company_id\n    }, function(res) {\n    \n        if(res.length_oath_key * 1 < 1){\n            _this.member_grid.footer.onClick('first');\n            return;\n        }\n        \n        Pman.Dialog.BAdminStaffTwoFactorQRCode.show({\n            id : res.id,\n            allow_close: false,\n            allow_cancel : true\n        }, function(res){\n            _this.member_grid.footer.onClick('first');\n        });\n    }); \n\n}"
                      },
                      "String cls" : "roo-toolbar-button",
                      "String weight" : "default",
diff --git a/Pman.Tab.BAdminStaff.js b/Pman.Tab.BAdminStaff.js
index e2cdbd65..19ce6515 100644
--- a/Pman.Tab.BAdminStaff.js
+++ b/Pman.Tab.BAdminStaff.js
@@ -165,7 +165,9 @@ Pman.Tab.BAdminStaff = new Roo.XComponent({
                              }
                              
                              Pman.Dialog.BAdminStaffTwoFactorQRCode.show({
-                                 id : res.id
+                                 id : res.id,
+                                 allow_close: false,
+                                 allow_cancel : true
                              }, function(res){
                                  _this.member_grid.footer.onClick('first');
                              });