fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2269 from norahmollo/BUG-TREE_STEPS

Browse Source 
Bug tree steps Error en la funcionalidad de guardar
This commit is contained in:
julceslauhub
2014-02-06 13:08:19 -02:00
parent 356b77eebf 0c44ef3887
commit 71dc4ee3a6
3 changed files with 57 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gulliver/js/form/core/form.js
View File

@@ -3908,13 +3908,15 @@ function dropDownSetOption(elem, arrayOption)
function dynaFormChanged(frm) function dynaFormChanged(frm)
{ {
for (var i1 = 0; i1 <= frm.elements.length - 1; i1++) { 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) { 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; return true;
} }
if (frm.elements[i1].tagName.toLowerCase() == "select") { if (frm.elements[i1].tagName.toLowerCase() == "select") {
var selectDefaultValue = frm.elements[i1].value; var selectDefaultValue = frm.elements[i1].value;

4
gulliver/js/maborak/core/maborak.js
View File

@@ -1281,8 +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;}}} 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("","");}} if(selectdd.options.length==0){selectdd.options[0]=new Option("","");}}
function dynaFormChanged(frm) 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;} {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].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;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].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;}}} if(frm.elements[i1].value!=selectDefaultValue){return true;}}}
return false;} return false;}

85
workflow/engine/templates/cases/open.js
View File

@@ -241,53 +241,64 @@ Ext.onReady(function(){
if (swForm == 1) { if (swForm == 1) {
var requiredField = ""; var requiredField = "";
var swRequiredField = 1; var swRequiredField = 1;
var dynaformChange ="";
var swDynaformChange = 0;
if (window.frames["openCaseFrame"].document.getElementsByTagName("form")) {
dynaformChange = window.frames["openCaseFrame"].document.getElementsByTagName("form").item(0);
swDynaformChange = (window.frames["openCaseFrame"].dynaFormChanged(dynaformChange))? 1 : 0;
}
if (window.frames["openCaseFrame"].document.getElementById("DynaformRequiredFields")) { if (window.frames["openCaseFrame"].document.getElementById("DynaformRequiredFields")) {
requiredField = window.frames["openCaseFrame"].document.getElementById("DynaformRequiredFields").value; requiredField = window.frames["openCaseFrame"].document.getElementById("DynaformRequiredFields").value;
if (requiredField != "") { if (requiredField != "") {
swRequiredField = (window.frames["openCaseFrame"].validateForm(requiredField))? 1 : 0; swRequiredField = (window.frames["openCaseFrame"].validateForm(requiredField))? 1 : 0;
} }
} }
if (swRequiredField == 1) { if (swRequiredField == 1){
Ext.MessageBox.show({ if (swDynaformChange) {
title: _("ID_CONFIRM"), Ext.MessageBox.show({
msg: _("ID_DYNAFORM_SAVE_CHANGES"), title: _("ID_CONFIRM"),
icon: Ext.MessageBox.QUESTION, msg: _("ID_DYNAFORM_SAVE_CHANGES"),
buttons: {ok: _("ID_ACCEPT"), cancel: _("ID_CANCEL")}, icon: Ext.MessageBox.QUESTION,
fn: function (btn) buttons: {ok: _("ID_ACCEPT"), cancel: _("ID_CANCEL")},
{ fn: function (btn)
loadMaskStep.show(); {
loadMaskStep.show();
if (btn == "ok") { if (btn == "ok") {
var frm = window.frames["openCaseFrame"].document.getElementsByTagName("form"); var frm = window.frames["openCaseFrame"].document.getElementsByTagName("form");
if (frm.length > 0) { if (frm.length > 0) {
var result = window.frames["openCaseFrame"].ajax_post( var result = window.frames["openCaseFrame"].ajax_post(
frm[0].action.replace("cases_SaveData", "saveForm"), frm[0].action.replace("cases_SaveData", "saveForm"),
frm[0], frm[0],
"POST", "POST",
function (responseText) function (responseText)
{ {
//Set URL and redirect //Set URL and redirect
document.getElementById("openCaseFrame").src = node.attributes.url; document.getElementById("openCaseFrame").src = node.attributes.url;
}, },
true true
); );
} else { } else {
//Set URL and redirect //Set URL and redirect
document.getElementById("openCaseFrame").src = node.attributes.url; document.getElementById("openCaseFrame").src = node.attributes.url;
} }
} else { } else {
//Set URL and redirect //Set URL and redirect
document.getElementById("openCaseFrame").src = node.attributes.url; document.getElementById("openCaseFrame").src = node.attributes.url;
} }
} }
}); });
} else { } else {
swNodeCurrentSelect = 1; loadMaskStep.show();
} document.getElementById("openCaseFrame").src = node.attributes.url;
}
} else {
swNodeCurrentSelect = 1;
}
} else { } else {
loadMaskStep.show(); loadMaskStep.show();