DataObjects/Core_domain.php

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

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index af563ce..e014b69 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -122,16 +122,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('merge_id').store.proxy.conn.url = baseURL + '/Roo/' + _this.data.table + '.php';
-                  _this.form.findField('merge_id').emptyText = "Select " + title;
-                  _this.form.findField('merge_id').reset();
+                   
                  return;
               }
               
           },
          actionfailed : function (_self, action)
           {
-              _this.dialog.el.unmask();
+           
               Pman.standardActionFailed(_self, action);
           },
          rendered : function (form)
@@ -176,7 +174,7 @@ Pman.Dialog.CoreEnumMerge = {
                  
                  o.params['etype'] = _this.data.etype;
                  
-                 
+                 o.params['!id'] = _this.form.findField('id').getValue();
                  // set more here
              }
            },