sync

[Pman.Admin] / Pman.Dialog.AdminEnumMerge.bjs

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index e8f8caa..ac25a0d 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.AdminEnumMerge",
  "parent" : "",
  "title" : "",
- "path" : "/home/edward/gitlive/Pman.Admin/Pman.Dialog.AdminEnumMerge.bjs",
+ "path" : "/home/benny/gitlive/web.hhyc_membership_system/Pman.Admin/Pman.Dialog.AdminEnumMerge.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -34,9 +34,9 @@
      "* prop" : "center"
     },
     {
+     "fitToFrame" : true,
      "background" : true,
      "region" : "center",
-     "fitToFrame" : true,
      "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}"
          },
+         "alwaysQuery" : true,
          "Number pageSize" : 50,
          "Boolean allowBlank" : false,
-         "alwaysQuery" : true,
          "triggerAction" : "all",
          "fieldLabel" : "Merge with",
          "forceSelection" : true,
@@ -77,7 +77,7 @@
          "items" : [
           {
            "listeners" : {
-            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    o.params.active = 1;\n    o.params.etype = _this.data.etype;\n    o.params['!id'] = _this.data.id;\n}\n"
+            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    o.params.active = 1;\n    o.params.etype = _this.data.etype;\n    o.params['!id'] = _this.data.id;\n    \n}\n"
            },
            "xtype" : "Store",
            "remoteSort" : true,
@@ -87,8 +87,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/Roo/Core_enum.php'",
-             "method" : "GET",
              "xtype" : "HttpProxy",
+             "method" : "GET",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },