From ec36f4e56e5761626230c2dd54828a06d44c5f44 Mon Sep 17 00:00:00 2001 From: edward Date: Fri, 4 Nov 2016 13:07:55 +0800 Subject: [PATCH] Pman.Tab.AdminCompanies.bjs Pman.Tab.AdminCompanies.js --- Pman.Tab.AdminCompanies.bjs | 2 +- Pman.Tab.AdminCompanies.js | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Pman.Tab.AdminCompanies.bjs b/Pman.Tab.AdminCompanies.bjs index 028e063..2a02930 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 if (!_this.dialog) {\n return;\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 _this.dialog.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 d8b9bf2..8b5f835 100644 --- a/Pman.Tab.AdminCompanies.js +++ b/Pman.Tab.AdminCompanies.js @@ -188,9 +188,7 @@ Pman.Tab.AdminCompanies = new Roo.XComponent({ Roo.MessageBox.alert("Error", s.length ? "Select only one Row" : "Select a Row"); return; } - if (!_this.dialog) { - return; - } + _this.dialog.show(s[0].data, function() { _this.grid.footer.onClick('first'); }); -- 2.39.2