sync

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

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index 29c89e7..ac25a0d 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -2,18 +2,19 @@
  "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" : {
   "0b3e4317865feb6f0224397600b7cafc" : "Merge Core Enum",
+  "03e956f1dca2b4d525df03cb1899cb6f" : "Merge with",
   "ea4788705e6873b424c65e91c2846b19" : "Cancel",
   "e0aa021e21dddbd6d8cecec71e9cf564" : "OK"
  },
  "items" : [
   {
    "listeners" : {
-    "show" : "function (_self)\n{\n\n}"
+    "show" : "function (_self)\n{\n    _this.merge.focus();\n}"
    },
    "modal" : true,
    "collapsible" : false,
@@ -33,9 +34,9 @@
      "* prop" : "center"
     },
     {
-     "region" : "center",
      "fitToFrame" : true,
      "background" : true,
+     "region" : "center",
      "xtype" : "ContentPanel",
      "$ xns" : "Roo",
      "items" : [
@@ -45,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" : [
@@ -56,6 +57,7 @@
          },
          "alwaysQuery" : true,
          "Number pageSize" : 50,
+         "Boolean allowBlank" : false,
          "triggerAction" : "all",
          "fieldLabel" : "Merge with",
          "forceSelection" : true,
@@ -75,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,
@@ -85,8 +87,8 @@
            "items" : [
             {
              "$ url" : "baseURL + '/Roo/Core_enum.php'",
-             "method" : "GET",
              "xtype" : "HttpProxy",
+             "method" : "GET",
              "$ xns" : "Roo.data",
              "* prop" : "proxy"
             },
@@ -123,7 +125,7 @@
     },
     {
      "listeners" : {
-      "|click" : "function() {\n\n    \n    _this.form.doAction('submit');\n    \n}"
+      "|click" : "function() \n{\n    if(typeof(_this.data._confirm) != 'undefined' && _this.data._confirm * 1 == 1){\n        Roo.MessageBox.confirm(\n            \"Confirm\", \n            \"Are you sure '\" + _this.data.display_name + \"' Merge with '\" + _this.form.findField('_merge_id').getRawValue() + \"'\", \n            function(res) {\n                if(res != 'yes') {\n                    return;\n                }\n                \n                _this.form.doAction('submit');\n                return;\n            }\n        );\n        \n        return;\n    }\n    _this.form.doAction('submit');\n    \n}"
      },
      "text" : "OK",
      "xtype" : "Button",