X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEnumMerge.bjs;h=f9c58b2b9110ef8b65bbf879b7a9b600f4cff033;hp=12f3119c786d1c27b37f0ffc9cd227b76d6944c5;hb=1524f8b36295809a3eedd6da3c6494f8aa0d86f5;hpb=33a318dc882d236dcc138b9dd64078e64c875d34

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 12f3119c..f9c58b2b 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -2,7 +2,7 @@
  "name" : "Pman.Dialog.CoreEnumMerge",
  "parent" : "",
  "title" : "",
- "path" : "/home/alan/gitlive/Pman.Core/Pman.Dialog.CoreEnumMerge.bjs",
+ "path" : "/home/benny/gitlive/web.hhyc_membership_system/Pman.Core/Pman.Dialog.CoreEnumMerge.bjs",
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
@@ -14,13 +14,6 @@
   "266459bee8ed1ca2e0464899e1ef0994" : "And replace with",
   "ea4788705e6873b424c65e91c2846b19" : "Cancel"
  },
- "named_strings" : {
-  "display_name_fieldLabel" : "8324cdec05065c4bd7d8c5effdf43edf",
-  "_merge_id_name_emptyText" : "bf8691517ce00a09186a05cd65863091",
-  "_merge_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
-  "_merge_id_name_qtip" : "bf8691517ce00a09186a05cd65863091",
-  "_merge_id_name_fieldLabel" : "266459bee8ed1ca2e0464899e1ef0994"
- },
  "items" : [
   {
    "listeners" : {
@@ -49,7 +42,7 @@
       {
        "listeners" : {
         "actionfailed" : "function (_self, action)\n{\n \n    Pman.standardActionFailed(_self, action);\n}\n",
-        "actioncomplete" : "function (_self, action)\n{\n\n   if (action.type =='submit') {\n       \n         _this.dialog.hide();\n       \n        if (_this.callback) {\n           _this.callback.call(_this, _this.form.getValues());\n        }\n        _this.form.reset();\n        return;\n    }\n    if (action.type == 'setdata') {\n        \n         var title = _this.data.title  || _this.data.etype;\n        _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n         \n       return;\n    }\n    \n}\n",
+        "actioncomplete" : "function (_self, action)\n{\n\n   if (action.type =='submit') {\n       \n         _this.dialog.hide();\n       \n        if (_this.callback) {\n           _this.callback.call(_this, _this.form.getValues());\n        }\n        _this.form.reset();\n        return;\n    }\n    if (action.type == 'setdata') {\n        \n         var title = _this.data.title  || _this.data.etype;\n        _this.dialog.setTitle(\"Delete selected \" + title + \" and merge data with\");\n        \n\n        if(typeof(_this.data._ids) == \"undefined\"){\n            this.load({ method: 'GET', params: { '_id' : _this.data.id }});  \n            return;\n        }\n        _this.form.findField('_names').setValue(_this.data._names);\n        _this.form.findField('_ids').setValue(_this.data._ids);\n        return;\n    }\n    \n}\n",
         "rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
        "$ url" : "baseURL + '/Roo/Core_enum.php'",
@@ -60,7 +53,7 @@
        "Number labelWidth" : 120,
        "items" : [
         {
-         "String name" : "display_name",
+         "String name" : "_names",
          "Number width" : 250,
          "Boolean readOnly" : true,
          "xtype" : "TextField",
@@ -126,6 +119,11 @@
          "$ xns" : "Roo.form",
          "name" : "etype"
         },
+        {
+         "xtype" : "Hidden",
+         "$ xns" : "Roo.form",
+         "name" : "_ids"
+        },
         {
          "xtype" : "Hidden",
          "$ xns" : "Roo.form",