X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=Pman.Dialog.CoreEnumMerge.js;h=2850db2748fb38e8843bf7735bd0aeeac2ed5333;hb=dff7116c31985c523f927df3e8e7cf50670ef428;hp=c9f14e550f2abd84f3aa1e8e58520725aac4698a;hpb=7be43acea4f026c0defe83bc2de1f3c40fb0fb47;p=Pman.Core

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index c9f14e55..2850db27 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -34,7 +34,7 @@ Pman.Dialog.CoreEnumMerge = {
 
   this.callback = cb;
   this.data = data;
-  this.dialog.show(this.data._el);
+  this.dialog.show.apply(this.dialog,  Array.prototype.slice.call(arguments).slice(2));
   if (this.form) {
    this.form.reset();
    this.form.setValues(data);
@@ -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;
               }
@@ -198,7 +197,15 @@ Pman.Dialog.CoreEnumMerge = {
                  
                  o.params['etype'] = _this.data.etype;
                  
-                 o.params['!id'] = _this.form.findField('id').getValue();
+                 var ids = _this.form.findField('_ids').getValue();
+                 if (ids.length) {
+                     var xids = ids.split(',');
+                     for(var i =0;i < xids.length; i++) {
+                         o.params['!id[' + i + ']'] = xids[i];
+                     }
+                 } else {
+                     o.params['!id'] = _this.form.findField('id').getValue();
+                 } 
                  // set more here
              }
            },