DataObjects/Core_company.php

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

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 1555ae7..b22b89f 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -16,6 +16,7 @@ Pman.Dialog.CoreEnumMerge = {
   'ea4788705e6873b424c65e91c2846b19' :"Cancel"
  },
  _named_strings : {
+  'display_name_fieldLabel' : '8324cdec05065c4bd7d8c5effdf43edf' /* Delete this */ ,
   '_merge_id_name_emptyText' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
   '_merge_id_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
   '_merge_id_name_qtip' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
@@ -128,8 +129,8 @@ Pman.Dialog.CoreEnumMerge = {
                   
                    var title = _this.data.title  || _this.data.etype;
                   _this.dialog.setTitle("Delete selected " + title + " and merge data with");
-                   
-                 return;
+                   this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
+                  return;
               }
               
           },
@@ -149,6 +150,8 @@ Pman.Dialog.CoreEnumMerge = {
          {
           xtype : 'TextField',
           fieldLabel : _this._strings['8324cdec05065c4bd7d8c5effdf43edf'] /* Delete this */,
+          name : 'display_name',
+          readOnly : true,
           width : 250,
           xns : Roo.form,
           '|xns' : 'Roo.form'