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

Merged in victorsl/processmaker (pull request #468)

Browse Source 
ProcessMaker-BE "BPMN Import (fix)"
This commit is contained in:
Erik Amaru Ortiz
2014-05-07 16:28:39 -04:00
parent 3b3cf6ab6d 5d6b6837d3
commit 14f343a278
1 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -309,7 +309,10 @@ class Bpmn extends Handler
}
// setting defaults
$data['ACT_UID'] = array_key_exists('ACT_UID', $data) ? $data['ACT_UID'] : Common::generateUID();;
$processUid = $process->getProUid();
$data["ACT_UID"] = (array_key_exists("ACT_UID", $data))? $data["ACT_UID"] : Common::generateUID();
$data["PRO_UID"] = $processUid;
try {
self::log("Add Activity with data: ", $data);
@@ -317,7 +320,7 @@ class Bpmn extends Handler
$activity = new Activity();
$activity->fromArray($data);
$activity->setPrjUid($this->getUid());
$activity->setProUid($process->getProUid());
$activity->setProUid($processUid);
$activity->save();
self::log("Add Activity Success!");
@@ -395,7 +398,10 @@ class Bpmn extends Handler
public function addEvent($data)
{
// setting defaults
$processUid = $this->getProcess("object")->getProUid();
$data['EVN_UID'] = array_key_exists('EVN_UID', $data) ? $data['EVN_UID'] : Common::generateUID();
$data["PRO_UID"] = $processUid;
try {
self::log("Add Event with data: ", $data);
@@ -403,7 +409,7 @@ class Bpmn extends Handler
$event = new Event();
$event->fromArray($data);
$event->setPrjUid($this->project->getPrjUid());
$event->setProUid($this->getProcess("object")->getProUid());
$event->setProUid($processUid);
$event->save();
self::log("Add Event Success!");
@@ -485,14 +491,17 @@ class Bpmn extends Handler
public function addGateway($data)
{
// setting defaults
$processUid = $this->getProcess("object")->getProUid();
$data['GAT_UID'] = array_key_exists('GAT_UID', $data) ? $data['GAT_UID'] : Common::generateUID();
$data["PRO_UID"] = $processUid;
try {
self::log("Add Gateway with data: ", $data);
$gateway = new Gateway();
$gateway->fromArray($data);
$gateway->setPrjUid($this->getUid());
$gateway->setProUid($this->getProcess("object")->getProUid());
$gateway->setProUid($processUid);
$gateway->save();
self::log("Add Gateway Success!");
} catch (\Exception $e) {
@@ -826,4 +835,5 @@ class Bpmn extends Handler
$status = $value ? "DISABLED" : "ACTIVE";
$this->update(array("PRJ_STATUS" => $status));
}
}
}