Merged in bugfix/PMC-388 (pull request #7117)

PMC-388

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Mauricio Veliz <mauricio@processmaker.com>
This commit is contained in:
Julio Cesar Laura Avendaño
2019-11-07 19:51:09 +00:00
2 changed files with 15 additions and 0 deletions

View File

@@ -1026,4 +1026,13 @@ class PmTable
return $type;
}
/**
* Remove the folder "pmt-folder" and all the content inside
*/
public static function removePmtPropelFolder()
{
$pmtPropelFolder = PATH_DB . config('system.workspace') . PATH_SEP . 'pmt-propel';
G::rm_dir($pmtPropelFolder);
}
}

View File

@@ -207,6 +207,9 @@ class pmTablesProxy extends HttpProxyController
public function save ($httpData, $alterTable = true)
{
try {
// Remove temporary Propel folder used by Report Tables and PM Tables (Bug PMC-388)
PmTable::removePmtPropelFolder();
$reportTable = new \ProcessMaker\BusinessModel\ReportTable();
return $reportTable->saveStructureOfTable((array)($httpData), $alterTable);
@@ -816,6 +819,9 @@ class pmTablesProxy extends HttpProxyController
fclose($f);
// Remove temporary Propel folder used by Report Tables and PM Tables (Bug PMC-388)
PmTable::removePmtPropelFolder();
//First Validate the file
$reportTable = new \ProcessMaker\BusinessModel\ReportTable();