diff --git a/workflow/engine/classes/class.processes.php b/workflow/engine/classes/class.processes.php index 7b2f6fc00..1c2aec660 100755 --- a/workflow/engine/classes/class.processes.php +++ b/workflow/engine/classes/class.processes.php @@ -3731,6 +3731,22 @@ class Processes return; } + /** + * Get Task User Rows from an array of data + * + * @param array $aTaskUser + * @return array $aStepTrigger + */ + public function removeTaskUserRows($tasks) + { + foreach ($tasks as $task) { + $oCriteria = new \Criteria('workflow'); + $oCriteria->add(\TaskUserPeer::TAS_UID, $task['TAS_UID']); + \TaskUserPeer::doDelete($oCriteria); + } + return; + } + /** * Get Task User Rows from an array of data * diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/AssignmentRulesMigrator.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/AssignmentRulesMigrator.php index e91768633..a9ee5a46e 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/AssignmentRulesMigrator.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/AssignmentRulesMigrator.php @@ -40,6 +40,7 @@ class AssignmentRulesMigrator implements Importable, Exportable if ($replace) { $this->processes->createTaskRows($data['tasks']); $this->processes->addNewGroupRow($data['groupwfs']); + $this->processes->removeTaskUserRows($data['tasks']); $this->processes->createTaskUserRows($data['taskusers']); } else { $this->processes->addNewTaskRows($data['tasks']); diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php index 814b0a99a..954cff759 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/GranularImporter.php @@ -121,9 +121,9 @@ class GranularImporter break; case 'REPORTTABLES': $objectList['REPORTTABLES']['reportTablesDefinition'] = isset($data['tables']['workflow']['reportTablesDefinition']) ? - $data['tables']['workflow']['reportTablesDefinition'] : ''; + $data['tables']['workflow']['reportTablesDefinition'] : []; $objectList['REPORTTABLES']['reportTablesFields'] = isset($data['tables']['workflow']['reportTablesFields']) ? - $data['tables']['workflow']['reportTablesFields'] : ''; + $data['tables']['workflow']['reportTablesFields'] : []; break; default: break; diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ReportTablesMigrator.php b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ReportTablesMigrator.php index 68954d28a..1901222af 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ReportTablesMigrator.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ReportTablesMigrator.php @@ -30,7 +30,6 @@ class ReportTablesMigrator implements Importable, Exportable { try { $reportTable = new \ProcessMaker\BusinessModel\ReportTable(); - $arrayTableSchema = []; $arrayTablesToExclude = []; $processUid = '';