sync

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

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index ad8f384..ac25a0d 100644 (file)
--- 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,33 +52,37 @@
        "$ 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,
          "selectOnFocus" : true,
          "xtype" : "ComboBox",
          "minChars" : 2,
-         "hiddenName" : "industry_id",
+         "hiddenName" : "_merge_id",
          "displayField" : "display_name",
          "valueField" : "id",
          "editable" : true,
          "Number listWidth" : 250,
          "width" : 250,
          "$ xns" : "Roo.form",
-         "name" : "industry_id_display_name",
+         "name" : "merge_display_name",
          "queryParam" : "query[search]",
          "tpl" : "<div class=\"x-grid-cell-text x-btn button\"><b>{display_name}</b> </div>",
          "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,
            "$ xns" : "Roo.data",
-           "$ sortInfo" : "{ direction : 'ASC', field: 'id' }",
+           "$ sortInfo" : "{ direction : 'ASC', field: 'display_name' }",
            "* prop" : "store",
            "items" : [
             {
@@ -89,7 +97,7 @@
              "root" : "data",
              "xtype" : "JsonReader",
              "$ xns" : "Roo.data",
-             "$ fields" : "[\n    {\n        \"name\":\"name\",\n        \"type\":\"string\"\n    },\n    {\n        \"name\":\"display_name\",\n        \"type\":\"string\"\n    }\n]",
+             "$ fields" : "[\n    {\n        \"name\":\"id\",\n        \"type\":\"int\"\n    },\n    {\n        \"name\":\"display_name\",\n        \"type\":\"string\"\n    }\n]",
              "* prop" : "reader",
              "totalProperty" : "total"
             }
@@ -117,7 +125,7 @@
     },
     {
      "listeners" : {
-      "|click" : "function() {\n\n    var name =     _this.form.findField('name').getValue();\n    name = name.toUpperCase().replace(/[^A-Z]+/g, '');\n    if (!name.length) {\n        Roo.MessageBox.alert(\"Error\",\"Please fill in a valid name\");\n        return;\n    }\n    _this.form.findField('name').setValue(name);\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",