X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEnumMerge.js;h=3e8d8415f8b6fc4ec5b24145436f137ce0a45f1a;hp=603b695649c20afb4e71ff8734c13d2a133daa54;hb=refs%2Fheads%2Fwip_edward_T5851_download_old_offer_sheet;hpb=ef8620aaad8868044c8139a1e9cdbcf9ef984d19

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 603b6956..3e8d8415 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -7,19 +7,20 @@ Roo.namespace('Pman.Dialog');
 Pman.Dialog.CoreEnumMerge = {
 
  _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 : {
   '_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 */ ,
-  '_merge_id_name_fieldLabel' : '6fd3ea70e4ce522aad292a75f2e16886' /* And replace with: */ 
+  '_merge_id_name_fieldLabel' : '266459bee8ed1ca2e0464899e1ef0994' /* And replace with */ ,
+  '_names_fieldLabel' : '8324cdec05065c4bd7d8c5effdf43edf' /* Delete this */ 
  },
 
  dialog : false,
@@ -53,7 +54,7 @@ Pman.Dialog.CoreEnumMerge = {
     modal : true,
     resizable : false,
     title : _this._strings['298a183cfe4fddedd4bd17abe8aeb685'] /* Merge Pulldown Option */,
-    width : 400,
+    width : 450,
     listeners : {
      show : function (_self)
       {
@@ -128,8 +129,15 @@ Pman.Dialog.CoreEnumMerge = {
                   
                    var title = _this.data.title  || _this.data.etype;
                   _this.dialog.setTitle("Delete selected " + title + " and merge data with");
-                   
-                 return;
+                  
+          
+                  if(typeof(_this.data._ids) == "undefined"){
+                      this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
+                      return;
+                  }
+                  _this.form.findField('_names').setValue(_this.data._names);
+                  _this.form.findField('_ids').setValue(_this.data._ids);
+                  return;
               }
               
           },
@@ -149,6 +157,9 @@ Pman.Dialog.CoreEnumMerge = {
          {
           xtype : 'TextField',
           fieldLabel : _this._strings['8324cdec05065c4bd7d8c5effdf43edf'] /* Delete this */,
+          name : '_names',
+          readOnly : true,
+          width : 250,
           xns : Roo.form,
           '|xns' : 'Roo.form'
          },
@@ -158,7 +169,7 @@ Pman.Dialog.CoreEnumMerge = {
           alwaysQuery : true,
           displayField : 'name',
           emptyText : _this._strings['bf8691517ce00a09186a05cd65863091'] /* Select Item to Merge With */,
-          fieldLabel : _this._strings['6fd3ea70e4ce522aad292a75f2e16886'] /* And replace with: */,
+          fieldLabel : _this._strings['266459bee8ed1ca2e0464899e1ef0994'] /* And replace with */,
           forceSelection : true,
           hiddenName : '_merge_id',
           listWidth : 400,
@@ -216,6 +227,12 @@ Pman.Dialog.CoreEnumMerge = {
           xns : Roo.form,
           '|xns' : 'Roo.form'
          },
+         {
+          xtype : 'Hidden',
+          name : '_ids',
+          xns : Roo.form,
+          '|xns' : 'Roo.form'
+         },
          {
           xtype : 'Hidden',
           name : 'id',