From 0c44ef388766709b1ea1328f9edcf3704ac2a0b9 Mon Sep 17 00:00:00 2001 From: norahmollo Date: Wed, 5 Feb 2014 16:48:30 -0400 Subject: [PATCH] BUG-TREE_STEPS Error en la funcionalidad de guardado Se debe validar solo cuando han ocurrido cambios --- gulliver/js/form/core/form.js | 12 +++++++----- gulliver/js/maborak/core/maborak.js | 5 ++--- workflow/engine/templates/cases/open.js | 17 ++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/gulliver/js/form/core/form.js b/gulliver/js/form/core/form.js index 291487ced..aad196d0f 100755 --- a/gulliver/js/form/core/form.js +++ b/gulliver/js/form/core/form.js @@ -3908,13 +3908,15 @@ function dropDownSetOption(elem, arrayOption) function dynaFormChanged(frm) { for (var i1 = 0; i1 <= frm.elements.length - 1; i1++) { - if (frm.elements[i1].type == "text" && frm.elements[i1].value != frm.elements[i1].defaultValue) { - return true; + + if((frm.elements[i1].type=="radio" || frm.elements[i1].type=="checkbox") && (frm.elements[i1].checked!=frm.elements[i1].defaultChecked)) { + return true; } - - if (frm.elements[i1].type == "textarea" && frm.elements[i1].value != frm.elements[i1].defaultValue) { - return true; + + if((frm.elements[i1].type=="textarea" || frm.elements[i1].type=="text" || frm.elements[i1].type=="file") && (frm.elements[i1].value!=frm.elements[i1].defaultValue)) { + return true; } + if (frm.elements[i1].tagName.toLowerCase() == "select") { var selectDefaultValue = frm.elements[i1].value; diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index e6834f173..23a3046bd 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -1281,9 +1281,8 @@ selectdd.innerHTML="";for(i=0;i<=arrayOption.options.length-1;i++){if(swOptGroup optionAux=document.createElement("option");optGroupAux.appendChild(optionAux);optionAux.value=arrayOption.options[i].key;optionAux.text=arrayOption.options[i].value;}else{optionAux=document.createElement("option");selectdd.appendChild(optionAux);optionAux.value=arrayOption.options[i].key;optionAux.text=arrayOption.options[i].value;}}} if(selectdd.options.length==0){selectdd.options[0]=new Option("","");}} function dynaFormChanged(frm) -{ for(var i1=0;i1<=frm.elements.length-1;i1++){ -if(((frm.elements[i1].type=="radio")||(frm.elements[i1].type=="checkbox")) && (frm.elements[i1].checked!=frm.elements[i1].defaultChecked)){return true;} -if( ((frm.elements[i1].type=="textarea")||(frm.elements[i1].type=="text")||(frm.elements[i1].type=="file")) && (frm.elements[i1].value!=frm.elements[i1].defaultValue)){return true;} +{for(var i1=0;i1<=frm.elements.length-1;i1++){if((frm.elements[i1].type=="radio"||frm.elements[i1].type=="checkbox")&&(frm.elements[i1].checked!=frm.elements[i1].defaultChecked)){return true;} +if((frm.elements[i1].type=="textarea"||frm.elements[i1].type=="text"||frm.elements[i1].type=="file")&&(frm.elements[i1].value!=frm.elements[i1].defaultValue)){return true;} if(frm.elements[i1].tagName.toLowerCase()=="select"){var selectDefaultValue=frm.elements[i1].value;for(var i2=0;i2<=frm.elements[i1].options.length-1;i2++){if(frm.elements[i1].options[i2].defaultSelected){selectDefaultValue=frm.elements[i1].options[i2].value;break;}} if(frm.elements[i1].value!=selectDefaultValue){return true;}}} return false;} diff --git a/workflow/engine/templates/cases/open.js b/workflow/engine/templates/cases/open.js index e46932053..45bd27203 100755 --- a/workflow/engine/templates/cases/open.js +++ b/workflow/engine/templates/cases/open.js @@ -256,8 +256,8 @@ Ext.onReady(function(){ } } - if (swDynaformChange) { - if ((swRequiredField == 1)){ + if (swRequiredField == 1){ + if (swDynaformChange) { Ext.MessageBox.show({ title: _("ID_CONFIRM"), msg: _("ID_DYNAFORM_SAVE_CHANGES"), @@ -292,14 +292,13 @@ Ext.onReady(function(){ } } }); - } else { + } else { + loadMaskStep.show(); + document.getElementById("openCaseFrame").src = node.attributes.url; + } + } else { swNodeCurrentSelect = 1; - } - } else { - loadMaskStep.show(); - //Set URL and redirect - document.getElementById("openCaseFrame").src = node.attributes.url; - } + } } else { loadMaskStep.show();