Pman.Dialog.CoreEnumMerge.bjs

[Pman.Core] / Pman.Dialog.CoreEnumMerge.bjs

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 9bc8b6b..85b8846 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -6,19 +6,20 @@
  "permname" : "",
  "modOrder" : "001",
  "strings" : {
-  "6fd3ea70e4ce522aad292a75f2e16886" : "And replace with:",
   "8324cdec05065c4bd7d8c5effdf43edf" : "Delete this",
   "298a183cfe4fddedd4bd17abe8aeb685" : "Merge Pulldown Option",
   "bf8691517ce00a09186a05cd65863091" : "Select Item to Merge With",
   "1243daf593fa297e07ab03bf06d925af" : "Searching...",
   "68be4837f6c739877233e527a996dd00" : "Merge",
+  "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" : "6fd3ea70e4ce522aad292a75f2e16886"
+  "_merge_id_name_fieldLabel" : "266459bee8ed1ca2e0464899e1ef0994"
  },
  "items" : [
   {
@@ -29,7 +30,7 @@
    "collapsible" : false,
    "title" : "Merge Pulldown Option",
    "xtype" : "LayoutDialog",
-   "width" : 400,
+   "width" : 450,
    "$ xns" : "Roo",
    "closable" : false,
    "resizable" : false,
@@ -48,7 +49,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         this.load({ method: 'GET', params: { '_id' : _this.data.id }});  \n        return;\n    }\n    \n}\n",
         "rendered" : "function (form)\n{\n   _this.form = form;\n}"
        },
        "$ url" : "baseURL + '/Roo/Core_enum.php'",
@@ -56,8 +57,12 @@
        "xtype" : "Form",
        "style" : "margin: 10px;",
        "$ xns" : "Roo.form",
+       "Number labelWidth" : 120,
        "items" : [
         {
+         "String name" : "display_name",
+         "Number width" : 250,
+         "Boolean readOnly" : true,
          "xtype" : "TextField",
          "String fieldLabel" : "Delete this",
          "$ xns" : "Roo.form"
@@ -66,7 +71,7 @@
          "alwaysQuery" : true,
          "listWidth" : 400,
          "triggerAction" : "all",
-         "fieldLabel" : "And replace with:",
+         "fieldLabel" : "And replace with",
          "forceSelection" : true,
          "selectOnFocus" : true,
          "pageSize" : 20,