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

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index ef128e9e..2850db27 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -16,11 +16,11 @@ Pman.Dialog.CoreEnumMerge = {
   'ea4788705e6873b424c65e91c2846b19' :"Cancel"
  },
  _named_strings : {
-  'display_name_fieldLabel' : '8324cdec05065c4bd7d8c5effdf43edf' /* Delete this */ ,
   '_merge_id_name_emptyText' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
   '_merge_id_name_loadingText' : '1243daf593fa297e07ab03bf06d925af' /* Searching... */ ,
   '_merge_id_name_qtip' : 'bf8691517ce00a09186a05cd65863091' /* Select Item to Merge With */ ,
-  '_merge_id_name_fieldLabel' : '266459bee8ed1ca2e0464899e1ef0994' /* And replace with */ 
+  '_merge_id_name_fieldLabel' : '266459bee8ed1ca2e0464899e1ef0994' /* And replace with */ ,
+  '_names_fieldLabel' : '8324cdec05065c4bd7d8c5effdf43edf' /* Delete this */ 
  },
 
  dialog : false,
@@ -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);
@@ -129,9 +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);
-                  //_this.form.findField('_names').setValue(_this.data.countrylist);
-                   this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
+                  
+          
+                  if(typeof(_this.data._ids) == "undefined"){
+                      this.load({ method: 'GET', params: { '_id' : _this.data.id }});  
+                      return;
+                  }
+                  _this.form.findField('_names').setValue(_this.data._names);
+                  _this.form.findField('_ids').setValue(_this.data._ids);
                   return;
               }
               
@@ -152,7 +157,7 @@ Pman.Dialog.CoreEnumMerge = {
          {
           xtype : 'TextField',
           fieldLabel : _this._strings['8324cdec05065c4bd7d8c5effdf43edf'] /* Delete this */,
-          name : 'display_name',
+          name : '_names',
           readOnly : true,
           width : 250,
           xns : Roo.form,
@@ -192,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
              }
            },
@@ -222,6 +235,12 @@ Pman.Dialog.CoreEnumMerge = {
           xns : Roo.form,
           '|xns' : 'Roo.form'
          },
+         {
+          xtype : 'Hidden',
+          name : '_ids',
+          xns : Roo.form,
+          '|xns' : 'Roo.form'
+         },
          {
           xtype : 'Hidden',
           name : 'id',