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

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