Pman.Dialog.AdminEnumMerge.bjs

Pman.Dialog.AdminEnumMerge.js

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index 1110074..ad8f384 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -69,7 +69,7 @@
          "items" : [
           {
            "listeners" : {
-            "|beforeload" : "function (_self, o){\n    o.params = o.params || {};\n    \n    Roo.log(_this.data);\n    o.params.active = 1;\n    o.params.etype = 'EuroCham.Industry';\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}\n"
            },
            "xtype" : "Store",
            "remoteSort" : true,

diff --git a/Pman.Dialog.AdminEnumMerge.js b/Pman.Dialog.AdminEnumMerge.js
index b7d07d6..c4bba97 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -167,9 +167,9 @@ Pman.Dialog.AdminEnumMerge = {
             beforeload : function (_self, o){
                  o.params = o.params || {};
                  
-                 Roo.log(_this.data);
                  o.params.active = 1;
-                 o.params.etype = 'EuroCham.Industry';
+                 o.params.etype = _this.data.etype;
+                 o.params['!id'] = _this.data.id;
              }
            },
            items : [