From 3e751e570bdb7c3f5233fd89030291053ce2cbc0 Mon Sep 17 00:00:00 2001 From: dheeyi william Date: Thu, 1 Dec 2016 11:37:26 -0400 Subject: [PATCH] HOR-2325 CLONE 3.2 - Classic>Case Scheduler> Al crear un case schduler muestra todos los frames del tipo --- gulliver/js/form/core/form.js | 8 ++++++-- gulliver/js/maborak/core/maborak.js | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index d22121d69..3c5d1e24f 100644 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -3566,7 +3566,9 @@ var removeRequiredById = function(sFieldName) { } else { fieldId = "form["+sFieldName+"]"; } - document.getElementById(fieldId).setAttribute('pm:required','0'); + if (document.getElementById(fieldId) != null) { + document.getElementById(fieldId).setAttribute('pm:required', '1'); + } var oAux = document.getElementById('__notValidateThisFields__'); if (oAux) { @@ -3583,7 +3585,9 @@ var enableRequiredById = function(sFieldName) { } else { fieldId = "form["+sFieldName+"]"; } - document.getElementById(fieldId).setAttribute('pm:required','1'); + if (document.getElementById(fieldId) != null) { + document.getElementById(fieldId).setAttribute('pm:required', '1'); + } var i; var aAux = []; diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index d6794373b..a4c74b37b 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -1192,8 +1192,10 @@ else{var oAux=window.document.getElementsByTagName('form');if(oAux.length>0){oAu {var evt=(window.event)?window.event:evt;var key=(evt.which)?evt.which:evt.keyCode;if(key==13){verifyLogin();}}.extend(this);promptPanel.fixContent();promptPanel.elements.statusBarButtons[0].onmouseup=verifyLogin;};var verifyLogin=function(){if(document.getElementById('thePassword').value.trim()==''){alert(_('ID_WRONG_PASS'));return;} var rpc=new leimnud.module.rpc.xmlhttp({url:'../login/authentication',args:'form[USR_USERNAME]='+__usernameLogged__+'&form[USR_PASSWORD]='+document.getElementById('thePassword').value.trim()+'&form[USR_LANG]='+SYS_LANG});rpc.callback=function(rpc){if(rpc.xmlhttp.responseText.indexOf('form[USR_USERNAME]')==-1){promptPanel.remove();lastActionPerformed='';}else{alert(_('ID_WRONG_PASS'));}}.extend(this);rpc.make();};var saveForm=function(oObject,actionParameter){if(oObject){var actionUrl=actionParameter||oObject.form.action.replace('cases_SaveData','saveForm');ajax_post(actionUrl,oObject.form,'POST');} else{var oAux=window.document.getElementsByTagName('form');if(oAux.length>0){var actionUrl=actionParameter||oAux[0].action.replace('cases_SaveData','saveForm');ajax_post(actionUrl,oAux[0],'POST');}}};var validateURL=function(url){var regexp=/http?s?:\/\/([-\w\.]+)+(:\d+)?(\/([\w/_\.]*(\?\S+)?)?)?/;if(regexp.test(url)){return true;}else{return false;}};var saveAndRedirectForm=function(oObject,oLocation){saveForm(oObject);if(validateURL(oLocation)){if(typeof(parent)!="undefined"){parent.location.href=oLocation;}else{document.location.href=oLocation;}}};var getGridFieldId=function(sFieldName){var arrayLabel=sFieldName.split("[");var arrayLabelSanitized=[];arrayLabel.map(function(n){arrayLabelSanitized.push(n.replace(/]|\[/g,''));});var gridFieldId="form["+arrayLabelSanitized[0]+"]["+arrayLabelSanitized[1]+"]["+arrayLabelSanitized[2]+"]";return gridFieldId;};var removeRequiredById=function(sFieldName){if(!notValidateThisFields.inArray(sFieldName)){notValidateThisFields.push(sFieldName);var fieldId;if(sFieldName.indexOf("]")>1){fieldId=getGridFieldId(sFieldName);}else{fieldId="form["+sFieldName+"]";} -document.getElementById(fieldId).setAttribute('pm:required','0');var oAux=document.getElementById('__notValidateThisFields__');if(oAux){oAux.value=notValidateThisFields.toJSONString();}}};var enableRequiredById=function(sFieldName){if(notValidateThisFields.inArray(sFieldName)){var fieldId;if(sFieldName.indexOf("]")>-1){fieldId=getGridFieldId(sFieldName);}else{fieldId="form["+sFieldName+"]";} -document.getElementById(fieldId).setAttribute('pm:required','1');var i;var aAux=[];for(i=0;i-1){fieldId=getGridFieldId(sFieldName);}else{fieldId="form["+sFieldName+"]";} +if(document.getElementById(fieldId)!=null){document.getElementById(fieldId).setAttribute('pm:required','1');} +var i;var aAux=[];for(i=0;i