fernando/luos
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of bitbucket.org:colosa/processmaker

Browse Source 
Conflicts:
	workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
This commit is contained in:
Victor Saisa Lopez
2014-07-25 11:56:22 -04:00
parent f1edbc7e87 07f6c824d5
commit 7a6462e588
2 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
workflow/engine/src/ProcessMaker/Project/Adapter/BpmnWorkflow.php
View File

@@ -720,6 +720,12 @@ class BpmnWorkflow extends Project\Bpmn
public static function updateFromStruct($prjUid, $projectData, $generateUid = true, $forceInsert = false)
{
$diagram = isset($projectData["diagrams"]) && isset($projectData["diagrams"][0]) ? $projectData["diagrams"][0] : array();
$diagram["activities"] = isset($diagram["activities"])? $diagram["activities"]: array();
$diagram["artifacts"] = isset($diagram["artifacts"])? $diagram["artifacts"]: array();
$diagram["gateways"] = isset($diagram["gateways"])? $diagram["gateways"]: array();
$diagram["events"] = isset($diagram["events"])? $diagram["events"]: array();
$diagram["data"] = isset($diagram["data"])? $diagram["data"]: array();
$diagram["participants"] = isset($diagram["participants"])? $diagram["participants"]: array();
$result = array();
$projectData['prj_uid'] = $prjUid;

8
workflow/engine/src/ProcessMaker/Project/Adapter/WorkflowBpmn.php
View File

@@ -792,5 +792,13 @@ class WorkflowBpmn extends Project\Workflow
throw $e;
}
}
public function addTask($taskData)
{
$tasUid = parent::addTask($taskData);
// logica para bpmn
$this->bp->addActivity(array('ACT_UID'=>$tasUid));
}
}