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

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 70bc6e96..3e8d8415 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -129,15 +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){
+          
+                  if(typeof(_this.data._ids) == "undefined"){
                       this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
-                      _this.form.findField('_names').setValue(_this.data.name);
                       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;
               }