Merged in zeitmaster/processmaker/MT-10 (pull request #4028)

MT-84
This commit is contained in:
Gustavo Cruz
2016-04-01 14:43:13 -04:00
4 changed files with 19 additions and 3 deletions

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

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;

View File

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