X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.Dialog.CoreEnumMerge.js;h=8e1c7fa0b42c1f73971a35baa54794d34908881f;hb=6c8d2f7e5786025ffc10aec0b09ccb4725f8fe91;hp=322a07d41e0b44e6a9ddfac6eecfa87447b70e02;hpb=8e8cb6c20ad7220a9850d865731332d6594530a8;p=Pman.Core diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js index 322a07d4..8e1c7fa0 100644 --- a/Pman.Dialog.CoreEnumMerge.js +++ b/Pman.Dialog.CoreEnumMerge.js @@ -130,8 +130,13 @@ 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); - _this.data.findField('_names').setValue(_this.data.materialList); + + if(!_this.data._ids){ this.load({ method: 'GET', params: { '_id' : _this.data.id }}); + _this.form.findField('_names').setValue(_this.data.name); + } + + _this.data.findField('_names').setValue(_this.data.materialList); return; }