BUG 9339 No validate FieldName used SOLVED

- I removed applyMask the field validate NODENAME
This commit is contained in:
Brayan Osmar Pereyra Suxo
2012-06-28 16:05:19 -04:00
parent 3487da5f7f
commit 51a4223dfa
2 changed files with 38 additions and 11 deletions

View File

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

View File

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