Pman.Tab.AdminEnum.bjs

Pman.Tab.AdminEnum.js

diff --git a/Pman.Tab.AdminEnum.bjs b/Pman.Tab.AdminEnum.bjs
index a86a8ce..a907a66 100644 (file)
--- a/Pman.Tab.AdminEnum.bjs
+++ b/Pman.Tab.AdminEnum.bjs
@@ -316,7 +316,7 @@
             },
             {
              "listeners" : {
-              "|click" : "function()\n{\n    var s = [];\n    s.push(_this.grid.selModel.selection.record.id);\n    \n    if (s.length * 1 < 1)  {\n        Roo.MessageBox.alert(\"Error\", \"Select a Row\");\n        return;\n    }\n    console.log(_this.grid);\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    var s = [];\n    s.push(_this.grid.selModel.selection.record.id);\n    \n    if (s.length * 1 < 1)  {\n        Roo.MessageBox.alert(\"Error\", \"Select a Row\");\n        return;\n    }\n    \n    var select_index = _this.grid.selModel.selection.record.selected;\n    \n    var d = _this.grid.ds.data(s[select_index]);\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 20c3ed1..b82caed 100644 (file)
--- a/Pman.Tab.AdminEnum.js
+++ b/Pman.Tab.AdminEnum.js
@@ -654,8 +654,10 @@ Pman.Tab.AdminEnum = new Roo.XComponent({
                     Roo.MessageBox.alert("Error", "Select a Row");
                     return;
                 }
-                console.log(_this.grid);
-                var d = _this.grid.ds.getAt(s[0]);
+                
+                var select_index = _this.grid.selModel.selection.record.selected;
+                
+                var d = _this.grid.ds.data(s[select_index]);
                 
                 Pman.Dialog.AdminEnumMerge.show(d.data, function() {
                     _this.grid.footer.onClick('refresh');