From 1d4bf258e82c98010ef06a6e28a674376f19a864 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Wed, 23 Mar 2016 16:40:41 -0400 Subject: [PATCH] MT-12: I solved the processDefinition --- .../BusinessModel/Migrator/PMXGenerator.php | 20 ++++++++++--------- .../Migrator/ProcessDefinitionMigrator.php | 3 ++- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PMXGenerator.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PMXGenerator.php index 6f8554220..9922f51fb 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PMXGenerator.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/PMXGenerator.php @@ -67,18 +67,20 @@ class PMXGenerator foreach ($elementData as $recordData) { $recordNode = $this->domDocument->createElement("record"); - $recordData = array_change_key_case($recordData, CASE_LOWER); + if(is_array($recordData)){ + $recordData = array_change_key_case($recordData, CASE_LOWER); - foreach ($recordData as $key => $value) { - if (is_object($value)) { - $value = serialize($value); + foreach ($recordData as $key => $value) { + if (is_object($value)) { + $value = serialize($value); + } + $columnNode = $this->domDocument->createElement($key); + $columnNode->appendChild($this->getTextNode($value)); + $recordNode->appendChild($columnNode); } - $columnNode = $this->domDocument->createElement($key); - $columnNode->appendChild($this->getTextNode($value)); - $recordNode->appendChild($columnNode); - } - $elementNode->appendChild($recordNode); + $elementNode->appendChild($recordNode); + } } $dataNode->appendChild($elementNode); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php index 50319cdfc..fbe7dd67a 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ProcessDefinitionMigrator.php @@ -108,11 +108,12 @@ class ProcessDefinitionMigrator implements Importable, Exportable $oData->timerEvent = $this->processes->getTimerEvents($prj_uid); $oData->emailEvent = $this->processes->getEmailEvent($prj_uid); $oData->abeConfiguration = $this->processes->getActionsByEmail($prj_uid); + $oData->processUser = $this->processes->getProcessUser($prj_uid); $oData->groupwfs = $this->processes->groupwfsMerge($oData->groupwfs, $oData->processUser, "USR_UID"); $oData->process["PRO_TYPE_PROCESS"] = "PUBLIC"; $result = array( - 'bpmn-definition' => $bpmnStruct, + 'bpmn-definition' => (array)$bpmnStruct, 'workflow-definition' => (array)$oData ); return $result;