Pman.Tab.AdminCompanies.bjs

Pman.Tab.AdminCompanies.js

diff --git a/Pman.Tab.AdminCompanies.bjs b/Pman.Tab.AdminCompanies.bjs
index 22461b2..0244376 100644 (file)
--- 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    \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    Roo.log(s);\n    return;\n    \n    Pman.Dialog.AdminCompanyMerge.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    \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    Pman.Dialog.AdminCompanyMerge.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 d33bf38..645e6c8 100644 (file)
--- a/Pman.Tab.AdminCompanies.js
+++ b/Pman.Tab.AdminCompanies.js
@@ -190,9 +190,6 @@ Pman.Tab.AdminCompanies = new Roo.XComponent({
                     return;
                 }
                 
-                Roo.log(s);
-                return;
-                
                 Pman.Dialog.AdminCompanyMerge.show(s[0].data, function() {
                     _this.grid.footer.onClick('first');
                 });