From 36c9a5954c80f1066e7d7af5b70e34017038580d Mon Sep 17 00:00:00 2001 From: edward Date: Fri, 4 Nov 2016 13:08:17 +0800 Subject: [PATCH] Pman.Tab.AdminCompanies.bjs Pman.Tab.AdminCompanies.js --- Pman.Tab.AdminCompanies.bjs | 2 +- Pman.Tab.AdminCompanies.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Pman.Tab.AdminCompanies.bjs b/Pman.Tab.AdminCompanies.bjs index 2a02930..c5afe2a 100644 --- a/Pman.Tab.AdminCompanies.bjs +++ b/Pman.Tab.AdminCompanies.bjs @@ -151,7 +151,7 @@ }, { "listeners" : { - "|click" : "function()\n{\n var s = _this.grid.getSelectionModel().getSelections();\n if (!s.length || (s.length > 1)) {\n Roo.MessageBox.alert(\"Error\", s.length ? \"Select only one Row\" : \"Select a Row\");\n return;\n }\n \n _this.dialog.show(s[0].data, function() {\n _this.grid.footer.onClick('first');\n }); \n \n}\n" + "|click" : "function()\n{\n var s = _this.grid.getSelectionModel().getSelections();\n if (!s.length || (s.length > 1)) {\n Roo.MessageBox.alert(\"Error\", s.length ? \"Select only one Row\" : \"Select a Row\");\n return;\n }\n \n Pman.Dialog.AdminCompanyMerge.show(s[0].data, function() {\n _this.grid.footer.onClick('first');\n }); \n \n}\n" }, "text" : "Merge", "xtype" : "Button", diff --git a/Pman.Tab.AdminCompanies.js b/Pman.Tab.AdminCompanies.js index 8b5f835..ad1a7bb 100644 --- a/Pman.Tab.AdminCompanies.js +++ b/Pman.Tab.AdminCompanies.js @@ -189,7 +189,7 @@ Pman.Tab.AdminCompanies = new Roo.XComponent({ return; } - _this.dialog.show(s[0].data, function() { + Pman.Dialog.AdminCompanyMerge.show(s[0].data, function() { _this.grid.footer.onClick('first'); }); -- 2.39.2