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

Merged in dheeyi/processmaker/HOR-900 (pull request #4186)

Browse Source 
HOR-900
This commit is contained in:
Julio Cesar Laura Avendaño
2016-05-03 14:29:36 -04:00
parent a861407001 b69777a39b
commit 02dfd90a9e
3 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3723,6 +3723,7 @@ class Processes
$rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC);
$rsCriteria->next(); $rsCriteria->next();
while ($aRow = $rsCriteria->getRow()) { while ($aRow = $rsCriteria->getRow()) {
$aRow['PRF_PATH'] = str_replace("\\", "/", $aRow['PRF_PATH']);
$arrayFilesManager[] = $aRow; $arrayFilesManager[] = $aRow;
$rsCriteria->next(); $rsCriteria->next();
} }

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

@@ -60,10 +60,10 @@ class FileHandler
if ($target == "PUBLIC" && in_array($filename, $arrayPublicFileToExclude)) { if ($target == "PUBLIC" && in_array($filename, $arrayPublicFileToExclude)) {
continue; continue;
} }
$filePath = $prj_uid . PATH_SEP . $filename;
$workflowFile[$target][] = array( $workflowFile[$target][] = array(
"filename" => $filename, "filename" => $filename,
"filepath" => $prj_uid . PATH_SEP . $filename, "filepath" => str_replace("\\", "/", $filePath),
"file_content" => file_get_contents($templatesFile) "file_content" => file_get_contents($templatesFile)
); );
} }

4
workflow/engine/src/ProcessMaker/Project/Workflow.php
View File

@@ -1230,10 +1230,10 @@ class Workflow extends Handler
if ($target == "PUBLIC" && in_array($filename, $arrayPublicFileToExclude)) { if ($target == "PUBLIC" && in_array($filename, $arrayPublicFileToExclude)) {
continue; continue;
} }
$filePath = $processUid . PATH_SEP . $filename;
$workflowFile[$target][] = array( $workflowFile[$target][] = array(
"filename" => $filename, "filename" => $filename,
"filepath" => $processUid . PATH_SEP . $filename, "filepath" => str_replace("\\", "/", $filePath),
"file_content" => file_get_contents($templatesFile) "file_content" => file_get_contents($templatesFile)
); );
} }