From dbab2668b2d90f6531e40464864aa03ff779fa25 Mon Sep 17 00:00:00 2001
From: benny <benny@roojs.com>
Date: Tue, 17 Jul 2018 17:06:36 +0800
Subject: [PATCH] Pman.Dialog.AdminEnumMerge.bjs Pman.Dialog.AdminEnumMerge.js

---
 Pman.Dialog.AdminEnumMerge.bjs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index 3fddf3e..e46e9b9 100644
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -34,9 +34,9 @@
      "* prop" : "center"
     },
     {
+     "region" : "center",
      "fitToFrame" : true,
      "background" : true,
-     "region" : "center",
      "xtype" : "ContentPanel",
      "$ xns" : "Roo",
      "items" : [
@@ -46,8 +46,8 @@
         "|rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
        "$ url" : "baseURL + '/Roo/core_enum.php'",
-       "method" : "POST",
        "xtype" : "Form",
+       "method" : "POST",
        "style" : "margin: 5px",
        "$ xns" : "Roo.form",
        "items" : [
@@ -55,9 +55,9 @@
          "listeners" : {
           "render" : "function (_self)\n{\n    _this.merge = this;\n}"
          },
+         "Boolean allowBlank" : false,
          "alwaysQuery" : true,
          "Number pageSize" : 50,
-         "Boolean allowBlank" : false,
          "triggerAction" : "all",
          "fieldLabel" : "Merge with",
          "forceSelection" : true,
@@ -87,8 +87,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/Roo/Core_enum.php'",
-             "method" : "GET",
              "xtype" : "HttpProxy",
+             "method" : "GET",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
-- 
2.39.2