Pman.Gnumeric.js

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

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 1555ae7..3e8d841 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -19,7 +19,8 @@ Pman.Dialog.CoreEnumMerge = {
   '_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' : '266459bee8ed1ca2e0464899e1ef0994' /* And replace with */ 
+  '_merge_id_name_fieldLabel' : '266459bee8ed1ca2e0464899e1ef0994' /* And replace with */ ,
+  '_names_fieldLabel' : '8324cdec05065c4bd7d8c5effdf43edf' /* Delete this */ 
  },
 
  dialog : false,
@@ -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,8 @@ Pman.Dialog.CoreEnumMerge = {
          {
           xtype : 'TextField',
           fieldLabel : _this._strings['8324cdec05065c4bd7d8c5effdf43edf'] /* Delete this */,
+          name : '_names',
+          readOnly : true,
           width : 250,
           xns : Roo.form,
           '|xns' : 'Roo.form'
@@ -217,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',