Merge pull request #149 from brayanpereyra/BUG-9339

BUG 9339 No validate FieldName used SOLVED

gulliver/js/form/core/form.js

@@ -1277,12 +1277,14 @@ function G_Text( form, element, name)
       }
       if (keyValid){
         //APPLY MASK
+        if ((me.validate == "Login" || me.validate == "NodeName") && me.mask == "") return true;
         if (pressKey == 46){
           me.applyMask(256); //This code send [.] period to the mask
         }
         else{
           me.applyMask(pressKey);
         }
+
         if (updateOnChange) me.sendOnChange();
       }
 
@@ -1337,12 +1339,6 @@ function G_Text( form, element, name)
             break;
         }
       }      
-      if (this.validate == 'NodeName') {
-        var pat = /^[a-z\_](.)[a-z\d\_]{1,255}$/i;
-        if(!pat.test(this.element.value)) {
-          this.element.value = '_' + this.element.value;
-        }
-      }
     }.extend(this);
   }
 
@@ -3127,10 +3123,21 @@ function dynaformVerifyFieldName(){
 
 function verifyFieldName1(){
   var newFieldName=fieldName.value;
+  var msj = _('DYNAFIELD_ALREADY_EXIST');
   var validatedFieldName=getField("PME_VALIDATE_NAME",fieldForm).value;
   var dField = new input(getField('PME_XMLNODE_NAME'));
 
   var valid=(newFieldName!=='')&&(((newFieldName!==savedFieldName)&&(validatedFieldName===''))||((newFieldName===savedFieldName)));
+  if (newFieldName.length == 0) {
+    valid = false;
+    msj   = _('DYNAFIELD_EMPTY');
+  }
+
+  if (!(isNaN(parseInt(newFieldName.substr(0,1))))) {
+    valid = false;
+    msj   = _('DYNAFIELD_NODENAME_NUMBER');
+  }
+
   if (valid){
     dField.passed();
     getField("PME_ACCEPT",fieldForm).disabled=false;
@@ -3138,7 +3145,7 @@ function verifyFieldName1(){
     getField("PME_ACCEPT",fieldForm).disabled=true;
     dField.failed();
     new leimnud.module.app.alert().make({
-      label: G_STRINGS.DYNAFIELD_ALREADY_EXIST
+      label: msj
     });
     dField.focus();
   }

workflow/engine/js/dynaformEditor/core/dynaformEditor.js

@@ -591,20 +591,40 @@ function getElementByPMClass(__class){
   function fieldsSave( form ) {
 
     var str    = document.getElementById('form[PME_XMLNODE_NAME]').value;
-    str.split(" ").length;
+    var dField = new input(getField('PME_XMLNODE_NAME'));
+
     if(str.split(" ").length>=2){
-      msgBox(G_STRINGS.ID_EMPTY_NODENAME,"alert");
+      msgBox(_("ID_EMPTY_NODENAME"), "alert");
+      dField.failed();
+      dField.focus();
+      return;
+    }
+
+    if (str.length == 0) {
+      msgBox(_("DYNAFIELD_EMPTY"), "alert");
+      dField.failed();
+      dField.focus();
+      return;
+    }
+    
+    if (!(isNaN(parseInt(str.substr(0,1))))) {
+      msgBox(_("DYNAFIELD_NODENAME_NUMBER"), "alert");
+      dField.failed();
+      dField.focus();
       return;
     }
 
     if (pme_validating) {
       validatingForm=form;
+      dField.passed();
       setTimeout('fieldsSave(validatingForm);',100);
       return;
     }
+    
     if (!G.getObject(form).verifyRequiredFields()){
       return;
     }
+    
     //processbar.style.display = '';
     var res=ajax_post( form.action, form, 'POST' , null , false );
     currentPopupWindow.remove();