From 990304433dbc51be7b20db40b2c6f947419951c0 Mon Sep 17 00:00:00 2001
From: benny <benny@roojs.com>
Date: Tue, 17 Jul 2018 17:26:39 +0800
Subject: [PATCH] Pman.Dialog.AdminEnumMerge.bjs Pman.Dialog.AdminEnumMerge.js

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

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index 4154c0f..793ffa4 100644
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -77,7 +77,7 @@
          "items" : [
           {
            "listeners" : {
-            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    o.params.active = 1;\n    o.params.etype = _this.data.etype;\n    o.params['!id'] = _this.data.id;\n    o.params.name = _this.data.name;\n}\n"
+            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    o.params.active = 1;\n    o.params.etype = _this.data.etype;\n    o.params['!id'] = _this.data.id;\n    o.params['name'] = _this.data.name;\n}\n"
            },
            "xtype" : "Store",
            "remoteSort" : true,
diff --git a/Pman.Dialog.AdminEnumMerge.js b/Pman.Dialog.AdminEnumMerge.js
index e52552e..f0366dd 100644
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -187,7 +187,7 @@ Pman.Dialog.AdminEnumMerge = {
                  o.params.active = 1;
                  o.params.etype = _this.data.etype;
                  o.params['!id'] = _this.data.id;
-                 o.params.name = _this.data.name;
+                 o.params['name'] = _this.data.name;
              }
            },
            xns : Roo.data,
-- 
2.39.2