From b7fc7ee98010ad2f773c3496e25e552855e8474c Mon Sep 17 00:00:00 2001 From: Freddy Daniel Rojas Valda Date: Tue, 3 Feb 2015 15:44:38 -0400 Subject: [PATCH 1/2] PM-978 "FIX notice new issues(webentry, variables). Complete Extended XML bpmn schema to add running artifacts in file .pmx" SOLVED --- workflow/engine/classes/class.processes.php | 14 ++++++++------ .../src/ProcessMaker/Project/Workflow.php | 17 +++++++++-------- 2 files changed, 17 insertions(+), 14 deletions(-) mode change 100644 => 100755 workflow/engine/src/ProcessMaker/Project/Workflow.php diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index b74d241af..606dd2bf3 100755 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -2197,12 +2197,14 @@ class Processes public function renewAllProcessVariableUid(&$data) { try { - $map = array (); - foreach ($data->processVariables as $key => $val) { - if (isset( $val['VAR_UID'] )) { - $newGuid = $this->getUnusedProcessVariableGUID(); - $map[$val['VAR_UID']] = $newGuid; - $data->processVariables[$key]['VAR_UID'] = $newGuid; + if (isset($data->processVariables)) { + $map = array(); + foreach ($data->processVariables as $key => $val) { + if (isset($val['VAR_UID'])) { + $newGuid = $this->getUnusedProcessVariableGUID(); + $map[$val['VAR_UID']] = $newGuid; + $data->processVariables[$key]['VAR_UID'] = $newGuid; + } } } diff --git a/workflow/engine/src/ProcessMaker/Project/Workflow.php b/workflow/engine/src/ProcessMaker/Project/Workflow.php old mode 100644 new mode 100755 index 752cbc2fa..095d36fe7 --- a/workflow/engine/src/ProcessMaker/Project/Workflow.php +++ b/workflow/engine/src/ProcessMaker/Project/Workflow.php @@ -1153,19 +1153,20 @@ class Workflow extends Handler } //Update WEB_ENTRY_EVENT.EVN_UID - foreach ($arrayWorkflowData["webEntryEvent"] as $key => $value) { - $webEntryEventEventUid = $arrayWorkflowData["webEntryEvent"][$key]["EVN_UID"]; + if (isset($arrayWorkflowData["webEntryEvent"])) { + foreach ($arrayWorkflowData["webEntryEvent"] as $key => $value) { + $webEntryEventEventUid = $arrayWorkflowData["webEntryEvent"][$key]["EVN_UID"]; - foreach ($arrayUid as $value2) { - $arrayItem = $value2; + foreach ($arrayUid as $value2) { + $arrayItem = $value2; - if ($arrayItem["old_uid"] == $webEntryEventEventUid) { - $arrayWorkflowData["webEntryEvent"][$key]["EVN_UID"] = $arrayItem["new_uid"]; - break; + if ($arrayItem["old_uid"] == $webEntryEventEventUid) { + $arrayWorkflowData["webEntryEvent"][$key]["EVN_UID"] = $arrayItem["new_uid"]; + break; + } } } } - //Workflow tables $workflowData = (object)($arrayWorkflowData); From 5770900707d8a2bf6535ad6e9aaa889dba8ed6ad Mon Sep 17 00:00:00 2001 From: william Date: Tue, 3 Feb 2015 17:01:00 -0400 Subject: [PATCH 2/2] Campo Status en creacion de grupos es editable. Causa. En es una ventana POPUP, que muestra 2 elementos, una que recibe el nombre del GRUPO a crearse y el otro es un COMBOBOX, de activo e inactivo sin embargo son editables; es decir cuando seleccionas ACTIVO lo puedes sobre escribir con cualquier texto. Solucion. Editar el archivo que contiene estos controldaores y hacer no EDITABLE el COMBOBOX, mas o menos de la siguiente manera: setEditable(false). --- workflow/engine/templates/groups/groupsList.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/workflow/engine/templates/groups/groupsList.js b/workflow/engine/templates/groups/groupsList.js index 4146dbbe7..946c8b98f 100755 --- a/workflow/engine/templates/groups/groupsList.js +++ b/workflow/engine/templates/groups/groupsList.js @@ -352,6 +352,8 @@ DoNothing = function(){}; NewGroupWindow = function(){ newForm.getForm().reset(); newForm.getForm().items.items[0].focus('',500); + newForm.getForm().items.items[1].setEditable(false); + w = new Ext.Window({ autoHeight: true, width: 400,