From b02de2b04bffe253f2410217f0bd5415d99b894b Mon Sep 17 00:00:00 2001
From: Alan Knowles <alan@roojs.com>
Date: Fri, 22 Jan 2016 13:36:09 +0800
Subject: [PATCH] Pman.Dialog.CoreEnumMerge.bjs Pman.Dialog.CoreEnumMerge.js

---
 Pman.Dialog.CoreEnumMerge.bjs |  4 ++--
 Pman.Dialog.CoreEnumMerge.js  | 12 ++----------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Pman.Dialog.CoreEnumMerge.bjs b/Pman.Dialog.CoreEnumMerge.bjs
index 100f4eb2..efb8c99f 100644
--- a/Pman.Dialog.CoreEnumMerge.bjs
+++ b/Pman.Dialog.CoreEnumMerge.bjs
@@ -76,7 +76,7 @@
          "items" : [
           {
            "listeners" : {
-            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    if (_this.data.params) {\n        Roo.apply(o.params, _this.data.params);\n    }\n    \n    o.params.comptype = _this.data.comptype;\n    o.params['!id'] = _this.data.id;\n    o.params['table'] = _this.data.table || 'Companies';\n    if (_this.data.table && _this.data.table == 'Person') {\n        o.params.company_id = _this.data.company_id;\n    }\n    \n    // set more here\n}\n"
+            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    o.params['etype'] = _this.data.etype;\n    \n    \n    // set more here\n}\n"
            },
            "xtype" : "Store",
            "remoteSort" : true,
@@ -107,7 +107,7 @@
         {
          "xtype" : "Hidden",
          "$ xns" : "Roo.form",
-         "name" : "table"
+         "name" : "etype"
         },
         {
          "xtype" : "Hidden",
diff --git a/Pman.Dialog.CoreEnumMerge.js b/Pman.Dialog.CoreEnumMerge.js
index f8205444..66b30f58 100644
--- a/Pman.Dialog.CoreEnumMerge.js
+++ b/Pman.Dialog.CoreEnumMerge.js
@@ -176,16 +176,8 @@ Pman.Dialog.CoreEnumMerge = {
             beforeload : function (_self, o){
                  o.params = o.params || {};
                  
-                 if (_this.data.params) {
-                     Roo.apply(o.params, _this.data.params);
-                 }
+                 o.params['etype'] = _this.data.etype;
                  
-                 o.params.comptype = _this.data.comptype;
-                 o.params['!id'] = _this.data.id;
-                 o.params['table'] = _this.data.table || 'Companies';
-                 if (_this.data.table && _this.data.table == 'Person') {
-                     o.params.company_id = _this.data.company_id;
-                 }
                  
                  // set more here
              }
@@ -209,7 +201,7 @@ Pman.Dialog.CoreEnumMerge = {
           }
          },
          {
-          name : 'table',
+          name : 'etype',
           xns : Roo.form,
           '|xns' : 'Roo.form',
           xtype : 'Hidden'
-- 
2.39.2