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

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 8e1c7fa0..3e8d8415 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -129,14 +129,14 @@ Pman.Dialog.CoreEnumMerge = {
                   
                    var title = _this.data.title  || _this.data.etype;
                   _this.dialog.setTitle("Delete selected " + title + " and merge data with");
-                  _this.form.findField('_ids').setValue(_this.data._ids);
                   
-                  if(!_this.data._ids){
-                   this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
-                   _this.form.findField('_names').setValue(_this.data.name);
+          
+                  if(typeof(_this.data._ids) == "undefined"){
+                      this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
+                      return;
                   }
-                  
-                  _this.data.findField('_names').setValue(_this.data.materialList);
+                  _this.form.findField('_names').setValue(_this.data._names);
+                  _this.form.findField('_ids').setValue(_this.data._ids);
                   return;
               }