X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEnumMerge.js;h=3e8d8415f8b6fc4ec5b24145436f137ce0a45f1a;hp=c9f14e550f2abd84f3aa1e8e58520725aac4698a;hb=refs%2Fheads%2Fwip_edward_T5851_download_old_offer_sheet;hpb=7be43acea4f026c0defe83bc2de1f3c40fb0fb47 diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js index c9f14e55..3e8d8415 100644 --- a/Pman.Dialog.CoreEnumMerge.js +++ b/Pman.Dialog.CoreEnumMerge.js @@ -131,12 +131,11 @@ Pman.Dialog.CoreEnumMerge = { _this.dialog.setTitle("Delete selected " + title + " and merge data with"); - 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; }