Pman.Dialog.CoreEnumMerge.bjs

Pman.Dialog.CoreEnumMerge.js

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 6285b5d..2c60d1c 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -45,7 +45,7 @@
         "actioncomplete" : "function (_self, action)\n{\n\n   if (action.type =='submit') {\n       \n       _this.dialog.el.unmask();\n       _this.dialog.hide();\n       \n        if (_this.callback) {\n           _this.callback.call(_this, _this.form.getValues());\n        }\n        _this.form.reset();\n        return;\n    }\n    if (action.type == 'setdata') {\n        _this.data.table = _this.data.table || 'Companies';\n        _this.form.findField('table').setValue(_this.data.table);\n         var title = _this.data.title  || _this.data.comptype;\n        _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n        _this.form.findField('merge_id').store.proxy.conn.url = baseURL + '/Roo/' + _this.data.table + '.php';\n        _this.form.findField('merge_id').emptyText = \"Select \" + title;\n        _this.form.findField('merge_id').reset();\n       return;\n    }\n    \n}\n",
         "rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
-       "$ url" : "baseURL + '/Shipping/CompanyMerge.php'",
+       "$ url" : "baseURL + '/Roo/Core_enum.php'",
        "method" : "POST",
        "xtype" : "Form",
        "style" : "margin: 10px;",

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index bd8c616..ecb2fd4 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -101,7 +101,7 @@ Pman.Dialog.CoreEnumMerge = {
        {
         method : 'POST',
         style : 'margin: 10px;',
-        url : baseURL + '/Shipping/CompanyMerge.php',
+        url : baseURL + '/Roo/Core_enum.php',
         xns : Roo.form,
         '|xns' : 'Roo.form',
         xtype : 'Form',