From: benny <benny@roojs.com>
Date: Tue, 17 Jul 2018 08:46:00 +0000 (+0800)
Subject: Pman.Tab.AdminEnum.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=commitdiff_plain;h=e0a8edb3dd2a02ff13134535ccaed1da81a1cc3c

Pman.Tab.AdminEnum.bjs
Pman.Tab.AdminEnum.js
---

diff --git a/Pman.Tab.AdminEnum.bjs b/Pman.Tab.AdminEnum.bjs
index c96b016..d39aab8 100644
--- a/Pman.Tab.AdminEnum.bjs
+++ b/Pman.Tab.AdminEnum.bjs
@@ -316,7 +316,7 @@
             },
             {
              "listeners" : {
-              "|click" : "function()\n{\n    console.log(_this.grid);\n    console.log(_this.grid.getSelectionModel());\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    Pman.Dialog.AdminEnumMerge.show(d.data, function() {\n        _this.grid.footer.onClick('refresh');\n    }); \n    \n}\n"
+              "|click" : "function()\n{\n    console.log(_this.grid);\n    console.log(_this.grid.getSelectionModel());\n    var s = _this.grid.getSelectionModel().getSelectedCell();\n    console.log(s);\n    if (!s.length)  {\n        Roo.MessageBox.alert(\"Error\", \"Select a Row\");\n        return;\n    }\n    console.log(_this.grid.ds);\n    var d = _this.grid.ds.getAt(s[0]);\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 85a78a1..6dcb074 100644
--- a/Pman.Tab.AdminEnum.js
+++ b/Pman.Tab.AdminEnum.js
@@ -650,12 +650,12 @@ Pman.Tab.AdminEnum = new Roo.XComponent({
                 console.log(_this.grid);
                 console.log(_this.grid.getSelectionModel());
                 var s = _this.grid.getSelectionModel().getSelectedCell();
-                
+                console.log(s);
                 if (!s.length)  {
                     Roo.MessageBox.alert("Error", "Select a Row");
                     return;
                 }
-                
+                console.log(_this.grid.ds);
                 var d = _this.grid.ds.getAt(s[0]);
             
                 Pman.Dialog.AdminEnumMerge.show(d.data, function() {