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

MT-84: Fix the asignment rules replace method according the original especification.

Browse Source
This commit is contained in:
Gustavo Adolfo Cruz Laura
2016-04-01 14:40:34 -04:00
parent 28c36c85d1
commit afc52521ce
4 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
workflow/engine/classes/class.processes.php
View File

@@ -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
*

1
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/AssignmentRulesMigrator.php
View File

@@ -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']);

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

@@ -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;

1
workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ReportTablesMigrator.php
View File

@@ -30,7 +30,6 @@ class ReportTablesMigrator implements Importable, Exportable
{
try {
$reportTable = new \ProcessMaker\BusinessModel\ReportTable();
$arrayTableSchema = [];
$arrayTablesToExclude = [];
$processUid = '';