DataObjects/Core_company.php

[Pman.Core] / Pman.Dialog.CoreEnumMerge.js

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index a289a97..9df3a92 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -130,8 +130,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);
-                  _this.form.findField('_names').setValue(_this.data.countrylist);
-                   this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
+                  
+                  if(!_this.data._ids){
+                      this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
+                      _this.data._names = _this.data.name;
+                      return;
+                  }
+                  
+                  _this.data._names = _this.data.materialList;
                   return;
               }