From 51a4223dfaeacb9a0785be0b7fe23f32cbaabbca Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 28 Jun 2012 16:05:19 -0400 Subject: [PATCH 1/2] BUG 9339 No validate FieldName used SOLVED - I removed applyMask the field validate NODENAME --- gulliver/js/form/core/form.js | 23 ++++++++++------ .../js/dynaformEditor/core/dynaformEditor.js | 26 ++++++++++++++++--- 2 files changed, 38 insertions(+), 11 deletions(-) diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index 4ae74fbfb..d9c0af7a7 100755 --- a/gulliver/js/form/core/form.js +++ b/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(); } @@ -1336,13 +1338,7 @@ function G_Text( form, element, name) this.element.value = this.element.value.toLowerCase(); 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 = G_STRINGS.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 = G_STRINGS.DYNAFIELD_EMPTY; + } + + if (!(isNaN(parseInt(newFieldName.substr(0,1))))) { + valid = false; + msj = ', '+G_STRINGS.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(); } diff --git a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js index 97c9e4606..df15f0acf 100755 --- a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js +++ b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js @@ -590,21 +590,41 @@ function getElementByPMClass(__class){ function fieldsSave( form ) { - var str = document.getElementById('form[PME_XMLNODE_NAME]').value; - str.split(" ").length; + var str = document.getElementById('form[PME_XMLNODE_NAME]').value; + var dField = new input(getField('PME_XMLNODE_NAME')); + 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; + } + 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(); From 40f4eadd16d0bd8812b7b64742e22939d0d5dc52 Mon Sep 17 00:00:00 2001 From: Brayan Osmar Pereyra Suxo Date: Thu, 28 Jun 2012 17:37:06 -0400 Subject: [PATCH 2/2] BUG 9339 Exist function G_STRINGS SOLVED - I removed G_STRINGS and I add funcion "_" --- gulliver/js/form/core/form.js | 6 +++--- workflow/engine/js/dynaformEditor/core/dynaformEditor.js | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index d9c0af7a7..a8fb891df 100755 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -3123,19 +3123,19 @@ function dynaformVerifyFieldName(){ function verifyFieldName1(){ var newFieldName=fieldName.value; - var msj = G_STRINGS.DYNAFIELD_ALREADY_EXIST; + 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 = G_STRINGS.DYNAFIELD_EMPTY; + msj = _('DYNAFIELD_EMPTY'); } if (!(isNaN(parseInt(newFieldName.substr(0,1))))) { valid = false; - msj = ', '+G_STRINGS.DYNAFIELD_NODENAME_NUMBER; + msj = _('DYNAFIELD_NODENAME_NUMBER'); } if (valid){ diff --git a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js index df15f0acf..b00e5933a 100755 --- a/workflow/engine/js/dynaformEditor/core/dynaformEditor.js +++ b/workflow/engine/js/dynaformEditor/core/dynaformEditor.js @@ -594,21 +594,21 @@ function getElementByPMClass(__class){ 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(G_STRINGS.DYNAFIELD_EMPTY, "alert"); + msgBox(_("DYNAFIELD_EMPTY"), "alert"); dField.failed(); dField.focus(); return; } if (!(isNaN(parseInt(str.substr(0,1))))) { - msgBox(G_STRINGS.DYNAFIELD_NODENAME_NUMBER, "alert"); + msgBox(_("DYNAFIELD_NODENAME_NUMBER"), "alert"); dField.failed(); dField.focus(); return;