DataObjects/Core_domain.php

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

diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index 31a0f3e..e014b69 100644 (file)
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -83,7 +83,7 @@ Pman.Dialog.CoreEnumMerge = {
       listeners : {
        click : function (_self, e)
         {
-            _this.dialog.el.mask("Merging");
+             
             _this.form.doAction("submit");
         
         }
@@ -110,8 +110,7 @@ Pman.Dialog.CoreEnumMerge = {
           
              if (action.type =='submit') {
                  
-                 _this.dialog.el.unmask();
-                 _this.dialog.hide();
+                   _this.dialog.hide();
                  
                   if (_this.callback) {
                      _this.callback.call(_this, _this.form.getValues());
@@ -120,20 +119,17 @@ Pman.Dialog.CoreEnumMerge = {
                   return;
               }
               if (action.type == 'setdata') {
-                  _this.data.table = _this.data.table || 'Companies';
-                  _this.form.findField('table').setValue(_this.data.table);
-                   var title = _this.data.title  || _this.data.comptype;
+                  
+                   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)
@@ -178,13 +174,13 @@ Pman.Dialog.CoreEnumMerge = {
                  
                  o.params['etype'] = _this.data.etype;
                  
-                 
+                 o.params['!id'] = _this.form.findField('id').getValue();
                  // set more here
              }
            },
            proxy : {
             method : 'GET',
-            url : baseURL + '/Roo/Companies.php',
+            url : baseURL + '/Roo/Core_enum',
             xns : Roo.data,
             '|xns' : 'Roo.data',
             xtype : 'HttpProxy'