Pman.Dialog.AdminEnumMerge.bjs

Pman.Dialog.AdminEnumMerge.js

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index fc5db96..3fddf3e 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'",
-       "xtype" : "Form",
        "method" : "POST",
+       "xtype" : "Form",
        "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,
@@ -87,8 +87,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/Roo/Core_enum.php'",
-             "xtype" : "HttpProxy",
              "method" : "GET",
+             "xtype" : "HttpProxy",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },

diff --git a/Pman.Dialog.AdminEnumMerge.js b/Pman.Dialog.AdminEnumMerge.js
index caf024c..81e07f4 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -12,6 +12,9 @@ Pman.Dialog.AdminEnumMerge = {
   'ea4788705e6873b424c65e91c2846b19' :"Cancel",
   'e0aa021e21dddbd6d8cecec71e9cf564' :"OK"
  },
+ _named_strings : {
+  'merge_display_name_fieldLabel' : '03e956f1dca2b4d525df03cb1899cb6f' /* Merge with */ 
+ },
 
  dialog : false,
  callback:  false,