From 51fd1ef9500e5699241003eb669bfbef2108f83f Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Thu, 23 Apr 2015 09:46:55 -0400 Subject: [PATCH 01/12] PM-2238 DesignerBPMN>ProcessFileManager: Cuando importas un template no verifica si existe otro template con el mismo nombre Se corrigio la validacion que se tenia, para que valide tambien cargar templates --- .../src/ProcessMaker/BusinessModel/FilesManager.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php b/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php index cdb3a9fc8..da32040ec 100644 --- a/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php +++ b/workflow/engine/src/ProcessMaker/BusinessModel/FilesManager.php @@ -190,12 +190,11 @@ class FilesManager break; } $content = $aData['prf_content']; - if (is_string($content)) { - if (file_exists($sDirectory)) { - $directory = $sMainDirectory. PATH_SEP . $sSubDirectory . $aData['prf_filename']; - throw new \Exception(\G::LoadTranslation("ID_EXISTS_FILE", array($directory))); - } + if (file_exists($sDirectory) ) { + $directory = $sMainDirectory. PATH_SEP . $sSubDirectory . $aData['prf_filename']; + throw new \Exception(\G::LoadTranslation("ID_EXISTS_FILE", array($directory))); } + if (!file_exists($sCheckDirectory)) { $sPkProcessFiles = \G::generateUniqueID(); $oProcessFiles = new \ProcessFiles(); @@ -555,4 +554,3 @@ class FilesManager } } } - From ec1972a758fcf7459a8450245c37ff6488d33f5b Mon Sep 17 00:00:00 2001 From: rodrigo quelca Date: Thu, 23 Apr 2015 15:43:51 -0400 Subject: [PATCH 02/12] PM-2167 and PM-2194 Add waiting/loading icon/gif when the process is being created or loaded.(fixed) --- workflow/engine/templates/designer/index.html | 1 + 1 file changed, 1 insertion(+) diff --git a/workflow/engine/templates/designer/index.html b/workflow/engine/templates/designer/index.html index bdc08add1..c9d76d383 100644 --- a/workflow/engine/templates/designer/index.html +++ b/workflow/engine/templates/designer/index.html @@ -79,6 +79,7 @@ +