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

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 8076dc98..3e8d8415 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -129,9 +129,14 @@ Pman.Dialog.CoreEnumMerge = {
                   
                    var title = _this.data.title  || _this.data.etype;
                   _this.dialog.setTitle("Delete selected " + title + " and merge data with");
+                  
+          
+                  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);
-                  _this.form.findField('_names').setValue(_this.data.countrylist);
-                   this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
                   return;
               }
               
@@ -222,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',