X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEnumMerge.js;h=3e8d8415f8b6fc4ec5b24145436f137ce0a45f1a;hp=1c0f8816f006ef4a24d985cac9eca02208ff7770;hb=refs%2Fheads%2Fwip_edward_T5851_download_old_offer_sheet;hpb=77c3de30b5718c13ee1d7abd714243d270071aff diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js index 1c0f8816..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 }}); return; } - - _this.data._names = _this.data.materialList; _this.form.findField('_names').setValue(_this.data._names); + _this.form.findField('_ids').setValue(_this.data._ids); return; }