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

HOR-4383 Import Pmtable in a new workspace

Browse Source 
- Change type validation in load additional table by name.
This commit is contained in:
Marco Antonio Nina Mena
2018-02-28 15:52:18 -04:00
committed by Julio Cesar Laura Avendaño
parent 7384d2ef26
commit c414dfef7d
5 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/model/AdditionalTables.php
View File

@@ -138,6 +138,14 @@ class AdditionalTables extends BaseAdditionalTables
return $this->primaryKeys;
}
/**
* Load Additional table by name
*
* @param string $name
* @return array
*
* @throws Exception
*/
public function loadByName($name)
{
try {

2
workflow/engine/methods/reportTables/reportTables_Ajax.php
View File

@@ -189,7 +189,7 @@ switch ($action) {
/**
* validations *
*/
if (is_array( $aNameTable )) {
if ($aNameTable) {
throw new Exception( 'The table "' . $data['REP_TAB_NAME'] . '" already exits.' );
}

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

@@ -59,7 +59,7 @@ class ReportTablesMigrator implements Importable, Exportable
if (!$replace) {
$additionalTable = new \AdditionalTables();
if ($additionalTable->loadByName($arrayTable['ADD_TAB_NAME']) !== false) {
if ($additionalTable->loadByName($arrayTable['ADD_TAB_NAME'])) {
$arrayTablesToExclude[] = $arrayTable['ADD_TAB_NAME'];
}
}

16
workflow/engine/src/ProcessMaker/BusinessModel/ReportTable.php
View File

@@ -105,7 +105,7 @@ class ReportTable
$arrayAdditionalTableData = $additionalTable->loadByName($tableName);
if ($arrayAdditionalTableData !== false) {
if ($arrayAdditionalTableData) {
$flagIsPmTable = $arrayAdditionalTableData['PRO_UID'] == '';
if ($flagIsPmTable && !empty($contentData)) {
@@ -275,7 +275,7 @@ class ReportTable
if ($flagFromAdmin) {
if ($flagIsPmTable) {
if ($arrayAdditionalTableData !== false && !$flagOverwrite) {
if ($arrayAdditionalTableData && !$flagOverwrite) {
$arrayError[$i]['NAME_TABLE'] = $contentSchema['ADD_TAB_NAME'];
$arrayError[$i]['ERROR_TYPE'] = 1; //ERROR_PM_TABLES_OVERWRITE
$arrayError[$i]['ERROR_MESS'] = \G::LoadTranslation('ID_OVERWRITE_PMTABLE', [$contentSchema['ADD_TAB_NAME']]);
@@ -290,7 +290,7 @@ class ReportTable
$arrayError[$i]['IS_PMTABLE'] = $flagIsPmTable;
$arrayError[$i]['PRO_UID'] = $tableProUid;
} else {
if ($arrayAdditionalTableData !== false && !$flagOverwrite) {
if ($arrayAdditionalTableData && !$flagOverwrite) {
$arrayError[$i]['NAME_TABLE'] = $contentSchema['ADD_TAB_NAME'];
$arrayError[$i]['ERROR_TYPE'] = 3; //ERROR_RP_TABLES_OVERWRITE
$arrayError[$i]['ERROR_MESS'] = \G::LoadTranslation('ID_OVERWRITE_RPTABLE', [$contentSchema['ADD_TAB_NAME']]);
@@ -307,14 +307,14 @@ class ReportTable
$arrayError[$i]['IS_PMTABLE'] = $flagIsPmTable;
$arrayError[$i]['PRO_UID'] = $tableProUid;
} else {
if ($tableProUid != $processUid) {
if ($tableProUid !== $processUid) {
$arrayError[$i]['NAME_TABLE'] = $contentSchema['ADD_TAB_NAME'];
$arrayError[$i]['ERROR_TYPE'] = 5; //ERROR_OVERWRITE_RELATED_PROCESS
$arrayError[$i]['ERROR_MESS'] = \G::LoadTranslation('ID_OVERWRITE_RELATED_PROCESS', [$contentSchema['ADD_TAB_NAME']]);
$arrayError[$i]['IS_PMTABLE'] = $flagIsPmTable;
$arrayError[$i]['PRO_UID'] = $tableProUid;
} else {
if ($arrayAdditionalTableData !== false && !$flagOverwrite) {
if ($arrayAdditionalTableData && !$flagOverwrite) {
$arrayError[$i]['NAME_TABLE'] = $contentSchema['ADD_TAB_NAME'];
$arrayError[$i]['ERROR_TYPE'] = 3; //ERROR_RP_TABLES_OVERWRITE
$arrayError[$i]['ERROR_MESS'] = \G::LoadTranslation('ID_OVERWRITE_RPTABLE', [$contentSchema['ADD_TAB_NAME']]);
@@ -419,7 +419,7 @@ class ReportTable
}
//Validations
if (is_array($additionalTable->loadByName($arrayData['REP_TAB_NAME']))) {
if ($additionalTable->loadByName($arrayData['REP_TAB_NAME'])) {
throw new \Exception(\G::LoadTranslation('ID_PMTABLE_ALREADY_EXISTS', [$arrayData['REP_TAB_NAME']]));
}
@@ -664,11 +664,11 @@ class ReportTable
//Overwrite
if ($flagOverwrite2) {
if ($arrayAdditionalTableData !== false) {
if ($arrayAdditionalTableData) {
$additionalTable->deleteAll($arrayAdditionalTableData['ADD_TAB_UID']);
}
} else {
if ($arrayAdditionalTableData !== false) {
if ($arrayAdditionalTableData) {
//Some table exists with the same name
//renaming...
$tNameOld = $contentSchema['ADD_TAB_NAME'];

2
workflow/engine/src/ProcessMaker/BusinessModel/Table.php
View File

@@ -253,7 +253,7 @@ class Table
// validations
if ($createRep) {
if (is_array( $oAdditionalTables->loadByName( $tableName ) )) {
if ($oAdditionalTables->loadByName($tableName)) {
throw new \Exception(G::loadTranslation('ID_PMTABLE_ALREADY_EXISTS', array($tableName)));
}
}