fix conflict

[Pman.Admin] / Pman.Tab.AdminEnum.bjs

diff --git a/Pman.Tab.AdminEnum.bjs b/Pman.Tab.AdminEnum.bjs
index 229f6b3..45c1ce6 100644 (file)
--- a/Pman.Tab.AdminEnum.bjs
+++ b/Pman.Tab.AdminEnum.bjs
@@ -2,7 +2,7 @@
     "name" : "Pman.Tab.AdminEnum",
     "parent" : "Pman.Tab.Admin",
     "title" : "Pman.Tab.AdminEnum",
-    "path" : "/home/michael/gitlive/Pman.Admin/Pman.Tab.AdminEnum.bjs",
+    "path" : "/home/alan/gitlive/Pman.Admin/Pman.Tab.AdminEnum.bjs",
     "permname" : "",
     "modOrder" : "500",
     "items" : [
@@ -214,9 +214,9 @@
                                                 },
                                                 {
                                                     "listeners" : {
-                                                        "click" : "function (_self, e)\n{\n\n  var s =     _this.egrid.getSelectionModel().getSelectedCell();\n    \n\n    if (!s) {\n        Roo.MessageBox.alert(\"Error\", \"Select a pulldown\");\n    }\n    \n    var d = _this.egrid.dataSource.getAt(s[0]);\n \n\n    var etype = d.data.name;\n    \n    if(!etype.length){\n        Roo.MessageBox.alert('Error', 'Please select a pulldown');\n        return;\n    }\n    \n    Pman.Dialog.Image.show(\n       {\n            _url : baseURL+'/Xtuple/Import/Enum?' + Roo.urlEncode({'etype' : etype})\n        \n       },\n       function () {\n            _this.grid.footer.onClick('first');\n       }\n   );\n}"
+                                                        "click" : "function (_self, e)\n{\n\n  var s =     _this.egrid.getSelectionModel().getSelectedCell();\n    \n\n    if (!s) {\n        Roo.MessageBox.alert(\"Error\", \"Select a pulldown\");\n    }\n    \n    var d = _this.egrid.dataSource.getAt(s[0]);\n \n\n    var etype = d.data.name;\n    \n    if(!etype.length){\n        Roo.MessageBox.alert('Error', 'Please select a pulldown');\n        return;\n    }\n    \n    Pman.Dialog.Image.show(\n       {\n            _url : baseURL+'/Admin/Import/Enum?' + Roo.urlEncode({'etype' : etype})\n        \n       },\n       function () {\n            _this.grid.footer.onClick('first');\n       }\n   );\n}"
                                                     },
-                                                    "text" : "Upload Value",
+                                                    "text" : "Upload Values",
                                                     "xtype" : "Button",
                                                     "$ xns" : "Roo.Toolbar"
                                                 }