fernando/luos
1
0
Fork 0
Code Releases Activity

Merged in bugfix/PMC-114 (pull request #6965)

Browse Source 
PMC-114

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
This commit is contained in:
Andrea Adamczyk
2019-07-11 19:42:23 +00:00
committed by Julio Cesar Laura Avendaño
parent ef7da50e83 43c3790b43
commit a1e4895268
5 changed files with 585 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
workflow/engine/src/ProcessMaker/Importer/Importer.php
View File

@@ -91,6 +91,7 @@ abstract class Importer
public function import($option = self::IMPORT_OPTION_CREATE_NEW, $optionGroup = self::GROUP_IMPORT_OPTION_CREATE_NEW, $generateUidFromJs = null, $objectsToImport = '')
{
$this->prepare();
$keepCreateDate = false;
//Verify data
switch ($option) {
case self::IMPORT_OPTION_CREATE_NEW:
@@ -126,6 +127,7 @@ abstract class Importer
case self::IMPORT_OPTION_DISABLE_AND_CREATE_NEW:
break;
case self::IMPORT_OPTION_KEEP_WITHOUT_CHANGING_AND_CREATE_NEW:
$keepCreateDate = true;
break;
}
@@ -258,12 +260,15 @@ abstract class Importer
$this->importData["tables"]["workflow"]["process"] = $this->importData["tables"]["workflow"]["process"][0];
//Import
if(!empty($generateUidFromJs)) {
if (!empty($generateUidFromJs)) {
$generateUid = $generateUidFromJs;
}
/*----------------------------------********---------------------------------*/
//Granular Import
try {
if ($generateUidFromJs || $keepCreateDate) {
unset($this->importData["tables"]["workflow"]["process"]["PRO_CREATE_DATE"]);
}
if ($objectsToImport !== '') {
$granularObj = new \ProcessMaker\BusinessModel\Migrator\GranularImporter();
$newObjectArray = $objectsToImport;
@@ -651,7 +656,9 @@ abstract class Importer
}
unset($arrayWorkflowTables["process"]["PRO_CREATE_USER"]);
unset($arrayWorkflowTables["process"]["PRO_CREATE_DATE"]);
if ($generateUid) {
unset($arrayWorkflowTables["process"]["PRO_CREATE_DATE"]);
}
unset($arrayWorkflowTables["process"]["PRO_UPDATE_DATE"]);
if ($flagDeleteCategory) {

14
workflow/engine/src/ProcessMaker/Model/BpmnProject.php Normal file
View File

@@ -0,0 +1,14 @@
<?php
namespace ProcessMaker\Model;
use Illuminate\Database\Eloquent\Model;
class BpmnProject extends Model
{
// Set our table name
protected $table = 'BPMN_PROJECT';
protected $primaryKey = 'PRJ_UID';
// We do not have create/update timestamps for this table
public $timestamps = false;
}