X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=blobdiff_plain;f=Pman.Dialog.AdminEnumMerge.bjs;h=ac25a0d7c0ff8cbd7822185a5520e0549bde78f2;hp=40ab9fec7bfe0df9a03372d3ac7b84cc97b33556;hb=HEAD;hpb=7ccebd6a822fa56413ebdbca83d8f84ef2f3d081

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index 40ab9fe..ac25a0d 100644
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -2,16 +2,20 @@
  "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    _this.merge.focus();\n}"
+   },
    "modal" : true,
    "collapsible" : false,
    "background" : true,
@@ -48,8 +52,12 @@
        "$ xns" : "Roo.form",
        "items" : [
         {
+         "listeners" : {
+          "render" : "function (_self)\n{\n    _this.merge = this;\n}"
+         },
          "alwaysQuery" : true,
          "Number pageSize" : 50,
+         "Boolean allowBlank" : false,
          "triggerAction" : "all",
          "fieldLabel" : "Merge with",
          "forceSelection" : true,
@@ -69,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,
@@ -117,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",