HOR-4383 Import Pmtable in a new workspace

- Change type validation in load additional table by name.

workflow/engine/classes/model/AdditionalTables.php

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

workflow/engine/methods/reportTables/reportTables_Ajax.php

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

workflow/engine/src/ProcessMaker/BusinessModel/Migrator/ReportTablesMigrator.php

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

workflow/engine/src/ProcessMaker/BusinessModel/ReportTable.php

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

workflow/engine/src/ProcessMaker/BusinessModel/Table.php

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