fernando/luos
1
0
Fork 0
Code Releases Activity

Merged colosa/processmaker into master

Browse Source
This commit is contained in:
Richard Yujra
2014-08-14 14:04:02 -04:00
parent 4e7b69a639 9c3d298c26
commit d0281479e4
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
features/backend/projects/project/main_tests_generate_bpmn.feature
View File

@@ -12,7 +12,7 @@ Background:
Given POST this data:
"""
{
"pro_uid": "36725102153eaca546b7cf8057019174"
"pro_uid": "22872259053dff3046d8db7020830606"
}
"""
And I request "project/generate-bpmn"

14
workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php
View File

@@ -412,17 +412,11 @@ class FilesManager
if ($path == '') {
throw new \Exception(\G::LoadTranslation("ID_INVALID_VALUE_FOR", array('prf_uid')));
}
$sFile = end(explode("/",$path));
$sPath = str_replace($sFile,'',$path);
$sSubDirectory = substr(str_replace($sProcessUID,'',substr($sPath,(strpos($sPath, $sProcessUID)))),0,-1);
$sMainDirectory = str_replace(substr($sPath, strpos($sPath, $sProcessUID)),'', $sPath);
if ($sMainDirectory == PATH_DATA_MAILTEMPLATES) {
$sMainDirectory = 'mailTemplates';
} else {
$sMainDirectory = 'public';
if (file_exists($path)) {
unlink($path);
}
$oProcessMap = new \processMap(new \DBConnection());
$oProcessMap->deleteFile($sProcessUID, $sMainDirectory, $sSubDirectory, $sFile);
$rs = \ProcessFilesPeer::doDelete($criteria);
} catch (Exception $e) {
throw $e;