From ce8f3c5199f20eb74a450cce64e6c42567480e7e Mon Sep 17 00:00:00 2001 From: benny Date: Tue, 17 Jul 2018 16:54:24 +0800 Subject: [PATCH] Pman.Tab.AdminEnum.bjs Pman.Tab.AdminEnum.js --- Pman.Tab.AdminEnum.bjs | 2 +- Pman.Tab.AdminEnum.js | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Pman.Tab.AdminEnum.bjs b/Pman.Tab.AdminEnum.bjs index 468e751..1189587 100644 --- a/Pman.Tab.AdminEnum.bjs +++ b/Pman.Tab.AdminEnum.bjs @@ -316,7 +316,7 @@ }, { "listeners" : { - "|click" : "function()\n{\n\n var s = _this.grid.getSelectionModel().getSelectedCell();\n\n if (!s.length) {\n Roo.MessageBox.alert(\"Error\", \"Select a Row\");\n return;\n }\n \n var d = _this.grid.ds.getAt(s[0]);\n console.log(Pman.Dialog.AdminEnumMerge);\n Pman.Dialog.AdminEnumMerge.show(d.data, function() {\n _this.grid.footer.onClick('refresh');\n }); \n \n}\n" + "|click" : "function()\n{\n\n var s = _this.grid.getSelectionModel().getSelectedCell();\n\n if (!s.length) {\n Roo.MessageBox.alert(\"Error\", \"Select a Row\");\n return;\n }\n \n var d = _this.grid.ds.getAt(s[0]);\n \n console.log(Pman.Dialog.AdminEnumMerge);\n \n Pman.Dialog.AdminEnumMerge.show(d.data, function() {\n _this.grid.footer.onClick('refresh');\n }); \n \n}\n" }, "text" : "Merge Option", "xtype" : "Button", diff --git a/Pman.Tab.AdminEnum.js b/Pman.Tab.AdminEnum.js index a5b4c96..8a7feea 100644 --- a/Pman.Tab.AdminEnum.js +++ b/Pman.Tab.AdminEnum.js @@ -656,7 +656,9 @@ Pman.Tab.AdminEnum = new Roo.XComponent({ } var d = _this.grid.ds.getAt(s[0]); + console.log(Pman.Dialog.AdminEnumMerge); + Pman.Dialog.AdminEnumMerge.show(d.data, function() { _this.grid.footer.onClick('refresh'); }); -- 2.39.2