From 28d49df9426f73bd539aa01d6e9e9ad5dd18016f Mon Sep 17 00:00:00 2001
From: edward <edward@roojs.com>
Date: Fri, 4 Nov 2016 13:11:38 +0800
Subject: [PATCH] Pman.Dialog.AdminCompanyMerge.bjs
 Pman.Dialog.AdminCompanyMerge.js

---
 Pman.Dialog.AdminCompanyMerge.bjs | 2 +-
 Pman.Dialog.AdminCompanyMerge.js  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Pman.Dialog.AdminCompanyMerge.bjs b/Pman.Dialog.AdminCompanyMerge.bjs
index 214c849..c3cfa59 100644
--- a/Pman.Dialog.AdminCompanyMerge.bjs
+++ b/Pman.Dialog.AdminCompanyMerge.bjs
@@ -44,7 +44,7 @@
         "actioncomplete" : "function (_self, action)\n{\n\n   if (action.type =='submit') {\n       \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        \n         var title = _this.data.title  || _this.data.etype;\n        _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n         \n       return;\n    }\n    \n}\n",
         "rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
-       "$ url" : "baseURL + '/Roo/Core_enum.php'",
+       "$ url" : "baseURL + '/Roo/Core_company.php'",
        "method" : "POST",
        "xtype" : "Form",
        "style" : "margin: 10px;",
diff --git a/Pman.Dialog.AdminCompanyMerge.js b/Pman.Dialog.AdminCompanyMerge.js
index 717bde8..7a035e8 100644
--- a/Pman.Dialog.AdminCompanyMerge.js
+++ b/Pman.Dialog.AdminCompanyMerge.js
@@ -99,7 +99,7 @@ Pman.Dialog.AdminCompanyMerge = {
         xtype : 'Form',
         method : 'POST',
         style : 'margin: 10px;',
-        url : baseURL + '/Roo/Core_enum.php',
+        url : baseURL + '/Roo/Core_company.php',
         listeners : {
          actioncomplete : function (_self, action)
           {
-- 
2.39.2