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

Merged in bugfix/HOR-2964 (pull request #5589)

Browse Source 
HOR-2964

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
dheeyi william
2017-04-05 18:20:59 +00:00
committed by Julio Cesar Laura Avendaño
parent acc8d80f12 3892a07e83
commit 008b5b2e07
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
workflow/engine/classes/model/Process.php
View File

@@ -176,7 +176,7 @@ class Process extends BaseProcess
$this->setProParent( $sNewProUid );
$this->setProTime( 1 );
$this->setProTimeunit( 'DAYS' );
$this->setProStatus( 'ACTIVE' );
$this->setProStatus((isset($aData["PRO_STATUS"])) ? $aData["PRO_STATUS"] : 'ACTIVE');
$this->setProTypeDay( '' );
$this->setProType((isset($aData["PRO_TYPE"]))? $aData["PRO_TYPE"]: "NORMAL");
$this->setProAssignment( 'FALSE' );

5
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php
View File

@@ -310,7 +310,10 @@ class GranularImporter
$arrayBpmnTables = $data["tables"]["bpmn"];
$arrayWorkflowTables = $data["tables"]["workflow"];
$arrayWorkflowFiles = $data["files"]["workflow"];
$result = $this->bpmn->createFromStruct($this->structureBpmnData($arrayBpmnTables), $generateUid);
$arrayBpmnTablesFormat = $this->structureBpmnData($arrayBpmnTables);
$arrayBpmnTablesFormat['prj_type'] = $arrayWorkflowTables['process']['PRO_TYPE'];
$arrayBpmnTablesFormat['pro_status'] = $arrayWorkflowTables['process']['PRO_STATUS'];
$result = $this->bpmn->createFromStruct($arrayBpmnTablesFormat, $generateUid);
$projectUidOld = $arrayBpmnTables["project"][0]["prj_uid"];
$projectUid = ($generateUid) ? $result[0]["new_uid"] : $result;
if ($generateUid) {

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

@@ -90,6 +90,10 @@ class BpmnWorkflow extends Project\Bpmn
$wpData["PRO_ID"] = $data["PRO_ID"];
}
if (array_key_exists("PRO_STATUS", $data)) {
$wpData["PRO_STATUS"] = $data["PRO_STATUS"];
}
$this->wp = new Project\Workflow();
$this->wp->create($wpData);
@@ -1310,6 +1314,10 @@ class BpmnWorkflow extends Project\Bpmn
$data["PRO_ID"] = $projectData["process"]["pro_id"];
}
if (isset($projectData['pro_status'])) {
$data["PRO_STATUS"] = $projectData['pro_status'];
}
$bwp->create($data);
$diagramData = $processData = array();