From: Alan Knowles <alan@roojs.com>
Date: Fri, 22 Jan 2016 05:38:20 +0000 (+0800)
Subject: Pman.Dialog.CoreEnumMerge.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=e1dc4ec2a1718d9461d4a270b996b0702b59674b

Pman.Dialog.CoreEnumMerge.bjs
Pman.Dialog.CoreEnumMerge.js
---

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 6a20c7df..e4a9d7b5 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -85,7 +85,7 @@
            "* prop" : "store",
            "items" : [
             {
-             "$ url" : "baseURL + '/Roo/Companies.php'",
+             "$ url" : "baseURL + '/Roo/Core_enum'",
              "xtype" : "HttpProxy",
              "method" : "GET",
              "$ xns" : "Roo.data",
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 31a0f3e0..00307100 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -184,7 +184,7 @@ Pman.Dialog.CoreEnumMerge = {
            },
            proxy : {
             method : 'GET',
-            url : baseURL + '/Roo/Companies.php',
+            url : baseURL + '/Roo/Core_enum',
             xns : Roo.data,
             '|xns' : 'Roo.data',
             xtype : 'HttpProxy'