From 47b00f49c3575b159db8ddf7e67318f336fcf633 Mon Sep 17 00:00:00 2001 From: edward Date: Fri, 4 Nov 2016 13:09:45 +0800 Subject: [PATCH] Pman.Tab.AdminCompanies.bjs Pman.Tab.AdminCompanies.js --- Pman.Tab.AdminCompanies.bjs | 2 +- Pman.Tab.AdminCompanies.js | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/Pman.Tab.AdminCompanies.bjs b/Pman.Tab.AdminCompanies.bjs index 22461b2..0244376 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 \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 Roo.log(s);\n return;\n \n Pman.Dialog.AdminCompanyMerge.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 \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 d33bf38..645e6c8 100644 --- a/Pman.Tab.AdminCompanies.js +++ b/Pman.Tab.AdminCompanies.js @@ -190,9 +190,6 @@ Pman.Tab.AdminCompanies = new Roo.XComponent({ return; } - Roo.log(s); - return; - Pman.Dialog.AdminCompanyMerge.show(s[0].data, function() { _this.grid.footer.onClick('first'); }); -- 2.39.2