X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=Pman.Dialog.CoreEnumMerge.js;h=3e8d8415f8b6fc4ec5b24145436f137ce0a45f1a;hp=f2de0463bda9ae8c2bac3b23c2cf82761918790f;hb=HEAD;hpb=ad3826c1343ad8a8fe7ba7afb194a40c2ea41d8f

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index f2de0463..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,9 +131,8 @@ Pman.Dialog.CoreEnumMerge = {
                   _this.dialog.setTitle("Delete selected " + title + " and merge data with");
                   
           
-                  if(typeof _ids == "undefined"){
+                  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._names);
@@ -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
              }
            },