Pman.Dialog.AdminEnumMerge.bjs

Pman.Dialog.AdminEnumMerge.js

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index c6a3f7c..9c3c082 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -124,7 +124,7 @@
     },
     {
      "listeners" : {
-      "|click" : "function() {\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'), \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 d806564..d1f9847 100644 (file)
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -79,9 +79,29 @@ Pman.Dialog.AdminEnumMerge = {
       '|xns' : 'Roo',
       xtype : 'Button',
       listeners : {
-       click : function() {
-        
-            
+       click : function() 
+        {
+            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'), 
+                    function(res) {
+                        if(res != 'yes') {
+                            return;
+                        }
+                        new Pman.Request({
+                            method : 'POST',
+                            url : baseURL + '/Roo/Core_enum',
+                            params : {
+                                _delete  : ids.join(',')
+                            },
+                            success : function() {
+                                _this.grid.footer.onClick('refresh');
+                            }
+                        });
+                    }
+                );
+            }
             _this.form.doAction('submit');
             
         }