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

Merged in bugfix/HOR-2886 (pull request #5546)

Browse Source 
HOR-2886

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2017-03-20 14:24:36 +00:00
parent 68ecd77994 4c55917424
commit 40564a59e8
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/src/ProcessMaker/Project/Bpmn.php
View File

@@ -751,6 +751,11 @@ class Bpmn extends Handler
//Check and validate Message Flow
$this->throwExceptionFlowIfIsAnInvalidMessageFlow($data);
//Validating FLO_CONDITION value
if (array_key_exists('FLO_CONDITION', $data) && is_null($data['FLO_CONDITION'])) {
$data['FLO_CONDITION'] = '';
}
//Create
$flow = new Flow();
$flow->fromArray($data, BasePeer::TYPE_FIELDNAME);
@@ -782,6 +787,11 @@ class Bpmn extends Handler
//Check and validate Message Flow
$this->throwExceptionFlowIfIsAnInvalidMessageFlow($data);
//Validating FLO_CONDITION value
if (array_key_exists('FLO_CONDITION', $data) && is_null($data['FLO_CONDITION'])) {
$data['FLO_CONDITION'] = '';
}
//Update
$flow = FlowPeer::retrieveByPk($floUid);
$flow->fromArray($data);