fernando/luos
1
0
Fork 0
Code Releases Activity

Merge remote branch 'upstream/master'

Browse Source
This commit is contained in:
marcelo.cuiza
2015-02-04 10:08:41 -04:00
parent 78c0d75522 ebcdf19113
commit 9846492a44
3 changed files with 19 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
workflow/engine/classes/class.processes.php
View File

@@ -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;
}
}
}

17
workflow/engine/src/ProcessMaker/Project/Workflow.php Normal file → Executable file
View File

@@ -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);

2
workflow/engine/templates/groups/groupsList.js
View File

@@ -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,