From 7fe7eadb79e5c78cb9b76e2a3b0d78d4c38ab3a4 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Thu, 26 Mar 2015 12:09:59 -0400 Subject: [PATCH] PM-1859 Error al ingresar a las reglas de ruteo de un subproceso El subproceso debe tener una regla de derivacion previa a ingresar a las opciones de routing rule, de lo contrario se desplegara un mensaje --- gulliver/js/maborak/core/maborak.js | 20 +++++++------ gulliver/js/maborak/core/maborak.loader.js | 5 ++-- workflow/engine/classes/class.processMap.php | 5 ++-- .../engine/js/processmap/core/processmap.js | 29 +++++++++++++++++-- 4 files changed, 44 insertions(+), 15 deletions(-) diff --git a/gulliver/js/maborak/core/maborak.js b/gulliver/js/maborak/core/maborak.js index be6c1a75b..ac03e0838 100644 --- a/gulliver/js/maborak/core/maborak.js +++ b/gulliver/js/maborak/core/maborak.js @@ -1282,6 +1282,7 @@ if(dir=="reverse"){newStr=newStr.split("").reverse().join("");} return newStr;} function getNumericValue(val,decimalSeparator) {var arrayNum=val.split("");var num="";for(var i=0;i<=arrayNum.length-1;i++){switch(arrayNum[i]){case"0":case"1":case"2":case"3":case"4":case"5":case"6":case"7":case"8":case"9":num=num+arrayNum[i];break;case decimalSeparator:num=num+".";break;}} +var arrayMatch=[];if(num!=""&&(arrayMatch=eval("/^[^\\d\\+\\-]*(\\+|\\-)\\s*\\d+[\\d\\.\\,\\;"+((decimalSeparator!="")?"\\"+decimalSeparator:"")+"]*[^\\d\\+\\-]*$/").exec(val))){num=arrayMatch[1]+num;} return num;} function gridGetAllFieldAndValue(fieldId,swCurrentField) {var frm=G.getObject(getField(fieldId).form);var arrayAux=fieldId.split("][");var gridName=arrayAux[0];var row=parseInt(arrayAux[1]);var fieldName=arrayAux[2];var grid;var gridField="";var fieldNameAux="";var fieldValueAux="";var i1=0;var i2=0;for(i1=0;i1<=frm.aElements.length-1;i1++){if(frm.aElements[i1].name==gridName){grid=frm.aElements[i1];for(i2=0;i2<=grid.aFields.length-1;i2++){fieldNameAux=grid.aFields[i2].sFieldName;fieldValueAux=grid.getElementByName(row,fieldNameAux).value();if((swCurrentField==1||fieldNameAux!=fieldName)&&typeof fieldValueAux!="undefined"){gridField=gridField+((gridField!="")?",":"")+"\""+fieldNameAux+"\":\""+fieldValueAux+"\"";}}}} @@ -1382,7 +1383,7 @@ switch(tag.toLowerCase()){case"input":case"textarea":newElem.value=elem.value;br newElem.options[i]=new Option(elem.options[i].text,elem.options[i].value,elem.options[i].defaultSelected);} newElem.options[pos].selected=true;} break;} -return newElem;};this.replaceHtml=function(el,html){var oldEl=typeof el==="string"?document.getElementById(el):el;if(this.determineBrowser()=="MSIE"){oldEl.innerHTML=html;return oldEl;}else{var newEl=oldEl.cloneNode(false);newEl.innerHTML=html;oldEl.parentNode.replaceChild(newEl,oldEl);return newEl;}};this.addGridRow=function(){this.oGrid=document.getElementById(this.sGridName);var i,aObjects;var defaultValue='';var n,a,x;var oRow=document.getElementById('firstRow_'+this.sGridName);var aCells=oRow.getElementsByTagName('td');var oNewRow=this.oGrid.insertRow(this.oGrid.rows.length-1);var currentRow=this.oGrid.rows.length-2;var newID,attributes,img2;oNewRow.onmouseover=function(){highlightRow(this,'#D9E8FF');};oNewRow.onmouseout=function(){highlightRow(this,'#fff');};for(i=0;i0){if(aObjects[0]){aObjects[0].id=aObjects[0].id.replace('/\['+(iRowAux-1)+'\]/g','\['+iRowAux+'\]');aObjects[0].name=aObjects[0].id.replace('/\['+(iRowAux-1)+'\]/g','\['+iRowAux+'\]');if(aObjects[0].onclick){sAux=new String(aObjects[0].onclick);eval('aObjects[0].onclick = '+sAux.replace('/\['+(iRowAux-1)+'\]/g','\['+iRowAux+'\]')+';');}} @@ -1434,10 +1436,10 @@ if(swLink==1){aObjects1[0].href=aObjects2[0].href;aObjects1[0].innerHTML=aObject break;default:if((oCell2.innerHTML.indexOf('changeValues')==111||oCell2.innerHTML.indexOf('changeValues')==115)){break;} break;}} iRowAux++;} -this.oGrid.deleteRow(lastItem);for(i=0;i<=this.aFields.length-1;i++){this.aElements.pop();} +document.getElementById(this.sGridName).deleteRow(lastItem);for(i=0;i<=this.aFields.length-1;i++){this.aElements.pop();} var elem;if(oObj.aFunctions.length>0){for(i=0;i<=oObj.aFunctions.length-1;i++){elem=document.getElementById("form["+oObj.sGridName+"][1]["+oObj.aFunctions[i].sFieldName+"]");if(elem){switch(oObj.aFunctions[i].sFunction){case"sum":oObj.sum(false,elem);break;case"avg":oObj.avg(false,elem);break;}}}} if(oObj.ondeleterow){oObj.ondeleterow(iRow);}};this.clearRowWC=function(oObj,aRow) -{var i=0;var j=0;var iAux=0;var pmLabel='';var elemNodeName='';var objects='';for(i=1;i0){pmLabel='';for(iAux=0;iAux<=objects[0].attributes.length-1;iAux++){if(objects[0].attributes[iAux].name=="pm:label"){pmLabel=objects[0].attributes[iAux].nodeValue;break;}} for(j=0;jgetMessage(); $G_PUBLISH->AddContent('xmlform', 'xmlform', 'login/showMessage', '', $aMessage); - G::RenderPage('publish', 'blank'); + G::RenderPage('publish', 'raw'); + return true; die(); } } diff --git a/workflow/engine/js/processmap/core/processmap.js b/workflow/engine/js/processmap/core/processmap.js index 0d1944693..30ce8b36c 100755 --- a/workflow/engine/js/processmap/core/processmap.js +++ b/workflow/engine/js/processmap/core/processmap.js @@ -1698,6 +1698,13 @@ var processmap=function(){ noClear : true }] }; + if (this.options.consolidated == '1') { + panel.tab.options.push({ + title : _('ID_CONSOLIDATED_CASE_LIST'), + content : this.parent.closure({instance:this,method:iForm,args:[panel,index,8]}), + noClear : true + }); + } var taskOptions = this.data.db.taskOptions; this.loadExtendedProperties = function(){ for(i=0;i