Pman.Tab.AdminEnum.bjs

Pman.Tab.AdminEnum.js

diff --git a/Pman.Tab.AdminEnum.bjs b/Pman.Tab.AdminEnum.bjs
index eccc287..28591a8 100644 (file)
--- a/Pman.Tab.AdminEnum.bjs
+++ b/Pman.Tab.AdminEnum.bjs
@@ -315,7 +315,7 @@
             },
             {
              "listeners" : {
-              "|click" : "function()\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    Roo.log(d);return;\n    Pman.Dialog.AdminEnumMerge.show(d.data, function() {\n        _this.grid.footer.onClick('first');\n    }); \n    \n}\n"
+              "|click" : "function()\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    Pman.Dialog.AdminEnumMerge.show(d.data, function() {\n        _this.grid.footer.onClick('first');\n    }); \n    \n}\n"
              },
              "text" : "Merge Option",
              "xtype" : "Button",

diff --git a/Pman.Tab.AdminEnum.js b/Pman.Tab.AdminEnum.js
index dac2258..1283965 100644 (file)
--- a/Pman.Tab.AdminEnum.js
+++ b/Pman.Tab.AdminEnum.js
@@ -652,7 +652,7 @@ Pman.Tab.AdminEnum = new Roo.XComponent({
                 }
                 
                 var d = _this.grid.ds.getAt(s[0]);
-                Roo.log(d);return;
+            
                 Pman.Dialog.AdminEnumMerge.show(d.data, function() {
                     _this.grid.footer.onClick('first');
                 });