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

Merged in mcuiza/processmaker/PM-2238 (pull request #1990)

Browse Source 
PM-2238 - DesignerBPMN>ProcessFileManager: Cuando importas un template no verifica si existe otro
This commit is contained in:
Julio Cesar Laura Avendaño
2015-04-27 13:35:10 -04:00
parent 396a6e8121 51fd1ef950
commit a880b6873f
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -190,12 +190,11 @@ class FilesManager
break; break;
} }
$content = $aData['prf_content']; $content = $aData['prf_content'];
if (is_string($content)) { if (file_exists($sDirectory) ) {
if (file_exists($sDirectory)) {
$directory = $sMainDirectory. PATH_SEP . $sSubDirectory . $aData['prf_filename']; $directory = $sMainDirectory. PATH_SEP . $sSubDirectory . $aData['prf_filename'];
throw new \Exception(\G::LoadTranslation("ID_EXISTS_FILE", array($directory))); throw new \Exception(\G::LoadTranslation("ID_EXISTS_FILE", array($directory)));
} }
}
if (!file_exists($sCheckDirectory)) { if (!file_exists($sCheckDirectory)) {
$sPkProcessFiles = \G::generateUniqueID(); $sPkProcessFiles = \G::generateUniqueID();
$oProcessFiles = new \ProcessFiles(); $oProcessFiles = new \ProcessFiles();
@@ -555,4 +554,3 @@ class FilesManager
} }
} }
} }