From: Edward <edward@roojs.com>
Date: Thu, 4 Jun 2015 08:28:51 +0000 (+0800)
Subject: Pman.Dialog.AdminEnumMerge.bjs
X-Git-Url: http://git.roojs.org/?p=Pman.Admin;a=commitdiff_plain;h=7ccebd6a822fa56413ebdbca83d8f84ef2f3d081

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

diff --git a/Pman.Dialog.AdminEnumMerge.bjs b/Pman.Dialog.AdminEnumMerge.bjs
index fe480e4..40ab9fe 100644
--- a/Pman.Dialog.AdminEnumMerge.bjs
+++ b/Pman.Dialog.AdminEnumMerge.bjs
@@ -117,7 +117,7 @@
     },
     {
      "listeners" : {
-      "|click" : "function() {\n\n    var name =     _this.form.findField('name').getValue();\n    name = name.toUpperCase().replace(/[^A-Z]+/g, '');\n    if (!name.length) {\n        Roo.MessageBox.alert(\"Error\",\"Please fill in a valid name\");\n        return;\n    }\n    _this.form.findField('name').setValue(name);\n \n    _this.form.doAction('submit');\n    \n}"
+      "|click" : "function() {\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 63b2644..ed25f2e 100644
--- a/Pman.Dialog.AdminEnumMerge.js
+++ b/Pman.Dialog.AdminEnumMerge.js
@@ -74,14 +74,7 @@ Pman.Dialog.AdminEnumMerge = {
        listeners : {
         click : function() {
          
-             var name =     _this.form.findField('name').getValue();
-             name = name.toUpperCase().replace(/[^A-Z]+/g, '');
-             if (!name.length) {
-                 Roo.MessageBox.alert("Error","Please fill in a valid name");
-                 return;
-             }
-             _this.form.findField('name').setValue(name);
-          
+             
              _this.form.doAction('submit');
              
          }