Pman.Dialog.AdminEnumMerge.bjs

Pman.Dialog.AdminEnumMerge.js

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index 9c3c082..e0b427d 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -124,7 +124,7 @@
     },
     {
      "listeners" : {
-      "|click" : "function() \n{\n    if(typeof(_this.data._confirm) != 'undefined' && _this.data._confirm * 1 == 1){\n        Roo.MessageBox.confirm(\n            \"Confirm\", \n            \"Are you sure '\" + _this.data.display_name + \"' Merge with \" + _this.form.findField('merge_id'), \n            function(res) {\n                if(res != 'yes') {\n                    return;\n                }\n                new Pman.Request({\n                    method : 'POST',\n                    url : baseURL + '/Roo/Core_enum',\n                    params : {\n                        _delete  : ids.join(',')\n                    },\n                    success : function() {\n                        _this.grid.footer.onClick('refresh');\n                    }\n                });\n            }\n        );\n    }\n    _this.form.doAction('submit');\n    \n}"
+      "|click" : "function() \n{\n    if(typeof(_this.data._confirm) != 'undefined' && _this.data._confirm * 1 == 1){\n        Roo.MessageBox.confirm(\n            \"Confirm\", \n            \"Are you sure '\" + _this.data.display_name + \"' Merge with '\" + _this.form.findField('_merge_id').getRawValue() + \"'\", \n            function(res) {\n                if(res != 'yes') {\n                    return;\n                }\n                new Pman.Request({\n                    method : 'POST',\n                    url : baseURL + '/Roo/Core_enum',\n                    params : {\n                        _delete  : ids.join(',')\n                    },\n                    success : function() {\n                        _this.grid.footer.onClick('refresh');\n                    }\n                });\n            }\n        );\n    }\n    _this.form.doAction('submit');\n    \n}"
      },
      "text" : "OK",
      "xtype" : "Button",

diff --git a/Pman.Dialog.AdminEnumMerge.js b/Pman.Dialog.AdminEnumMerge.js
index d1f9847..b430e03 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -84,7 +84,7 @@ Pman.Dialog.AdminEnumMerge = {
             if(typeof(_this.data._confirm) != 'undefined' && _this.data._confirm * 1 == 1){
                 Roo.MessageBox.confirm(
                     "Confirm", 
-                    "Are you sure '" + _this.data.display_name + "' Merge with " + _this.form.findField('merge_id'), 
+                    "Are you sure '" + _this.data.display_name + "' Merge with '" + _this.form.findField('_merge_id').getRawValue() + "'", 
                     function(res) {
                         if(res != 'yes') {
                             return;