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

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 322a07d4..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.data.findField('_names').setValue(_this.data.materialList);
-                   this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
                   return;
               }