From: benny <benny@roojs.com>
Date: Tue, 17 Jul 2018 09:26:03 +0000 (+0800)
Subject: Pman.Dialog.AdminEnumMerge.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=commitdiff_plain;h=d2f598e4a94d75ada21e87ff5db7d5d652099c34

Pman.Dialog.AdminEnumMerge.bjs
Pman.Dialog.AdminEnumMerge.js
---

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index e46e9b9..4154c0f 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}\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 81e07f4..e52552e 100644
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -187,6 +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;
              }
            },
            xns : Roo.data,