Pman.Tab.MTrackMerger.bjs

Pman.Tab.MTrackMerger.js

diff --git a/Pman.Tab.MTrackMerger.bjs b/Pman.Tab.MTrackMerger.bjs
index 8b4acd8..1aea69b 100644 (file)
--- a/Pman.Tab.MTrackMerger.bjs
+++ b/Pman.Tab.MTrackMerger.bjs
@@ -179,7 +179,7 @@
            "items" : [
             {
              "listeners" : {
-              "|click" : "function()\n{\n    // if we are just copying a simple commit accross with a valid message\n    // then this could contain the original commit message..\n   if (! _this.tree.tree.selModel.getSelectedNode()) {\n      Roo.MessageBox.alert(\"Error\", \"select a revision\");\n      return ;\n   }\n   var ar = _this.grid.sm.getSelections();\n   var files = []\n   Roo.each(ar, function(s) {\n        files.push(s.data.filename);\n   \n   });\n   \n   if (!files.length) {\n      Roo.MessageBox.alert(\"Error\", \"select some files\");\n      return ;\n   }\n    \n\n    Roo.MessageBox.show({\n       title: \"Create a Commit\",\n       msg: \"Enter commit message\",\n       width:300,\n       buttons: Roo.MessageBox.OKCANCEL,\n       multiline: true,\n       fn: function(btn, msg) {\n\n         if (btn != 'ok') {\n             return;\n          }\n          new Pman.Request({\n                method : 'POST',\n                url : baseURL + '/MTrack/Merger',\n                params : { \n                    message : msg,\n                    _merge : _this.tree.tree.selModel.getSelectedNode().attributes.rev,\n                    files :  Roo.encode(files),\n                },\n                success : function () {\n                   // reload the grid..\n                   _this.grid.ds.load({});\n                }\n           });\n       },\n       animEl: this.el\n   });\n}\n"
+              "|click" : "function()\n{\n    // if we are just copying a simple commit accross with a valid message\n    // then this could contain the original commit message..\n   if (! _this.tree.tree.selModel.getSelectedNode()) {\n      Roo.MessageBox.alert(\"Error\", \"select a revision\");\n      return ;\n   }\n   var ar = _this.grid.sm.getSelections();\n   var files = []\n   Roo.each(ar, function(s) {\n        files.push(s.data.filename);\n   \n   });\n   \n   if (!files.length) {\n      Roo.MessageBox.alert(\"Error\", \"select some files\");\n      return ;\n   }\n    \n\n    Roo.MessageBox.show({\n       title: \"Create a Commit\",\n       msg: \"Enter commit message\",\n       width:300,\n       buttons: Roo.MessageBox.OKCANCEL,\n       multiline: true,\n       fn: function(btn, msg) {\n\n         if (btn != 'ok') {\n             return;\n          }\n          new Pman.Request({\n                method : 'POST',\n                url : baseURL + '/MTrack/Merger',\n                params : { \n                    message : msg,\n                    _merge : _this.tree.tree.selModel.getSelectedNode().attributes.rev,\n                    files :  Roo.encode(files)\n                },\n                success : function () {\n                   // reload the grid..\n                   _this.grid.ds.load({});\n                }\n           });\n       },\n       animEl: this.el\n   });\n}\n"
              },
              "text" : "Create Commit Using Patch",
              "xtype" : "Button",

diff --git a/Pman.Tab.MTrackMerger.js b/Pman.Tab.MTrackMerger.js
index 484a93f..3bcf5f9 100644 (file)
--- a/Pman.Tab.MTrackMerger.js
+++ b/Pman.Tab.MTrackMerger.js
@@ -239,7 +239,7 @@ Pman.Tab.MTrackMerger = new Roo.XComponent({
                             params : { 
                                 message : msg,
                                 _merge : _this.tree.tree.selModel.getSelectedNode().attributes.rev,
-                                files :  Roo.encode(files),
+                                files :  Roo.encode(files)
                             },
                             success : function () {
                                // reload the grid..