DataObjects/Core_company.php

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

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index f9488da..85b8846 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -15,6 +15,7 @@
   "ea4788705e6873b424c65e91c2846b19" : "Cancel"
  },
  "named_strings" : {
+  "display_name_fieldLabel" : "8324cdec05065c4bd7d8c5effdf43edf",
   "_merge_id_name_emptyText" : "bf8691517ce00a09186a05cd65863091",
   "_merge_id_name_loadingText" : "1243daf593fa297e07ab03bf06d925af",
   "_merge_id_name_qtip" : "bf8691517ce00a09186a05cd65863091",
@@ -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'",
@@ -59,7 +60,9 @@
        "Number labelWidth" : 120,
        "items" : [
         {
+         "String name" : "display_name",
          "Number width" : 250,
+         "Boolean readOnly" : true,
          "xtype" : "TextField",
          "String fieldLabel" : "Delete this",
          "$ xns" : "Roo.form"