From c9488bfe99f5fc73d8fb5badbd6a8d429bb48049 Mon Sep 17 00:00:00 2001 From: "marcelo.cuiza" Date: Mon, 23 Feb 2015 10:07:11 -0400 Subject: [PATCH 1/3] PM-1310 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Al copiar una carpeta que tiene contenido se despliega un warning por cada archivo que contiene y no desaparece el cuadro de dialogo con la direccióe la copia Se valido que antes de copiar el directorio, este exista, de lo contrario crea el directorio --- workflow/engine/methods/appFolder/appFolderAjax.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php index 4f6dafa7f..c6aa461ac 100755 --- a/workflow/engine/methods/appFolder/appFolderAjax.php +++ b/workflow/engine/methods/appFolder/appFolderAjax.php @@ -1409,6 +1409,10 @@ function copyMoveExecuteTree($uidFolder, $newUidFolder) //Copy file $arrayPathFromFile = G::getPathFromFileUID($docInfo["APP_UID"], $docUid); $newFile = $arrayPathFromFile[0] . PATH_SEP . $arrayPathFromFile[1] . "_" . $docInfo["DOC_VERSION"] . "." . $extension; + + if(!file_exists($path . $arrayPathFromFile[0])) { + mkdir( $path . $arrayPathFromFile[0], 0777, true ); + } copy($path . $originFile, $path . $newFile); } else { From fb5562fc72107d881ef40b0cd7798d8ef386e16b Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 23 Feb 2015 11:09:57 -0400 Subject: [PATCH 2/3] I added some validations by PM-1544 --- workflow/engine/classes/class.derivation.php | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 390255c56..895b06998 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -176,14 +176,14 @@ class Derivation } $rsCriteria->setFetchmode(ResultSet::FETCHMODE_ASSOC); - + $flagDefault = false; while ($rsCriteria->next()) { $arrayRouteData = G::array_merges($rsCriteria->getRow(), $arrayData); if ((int)($arrayRouteData["ROU_DEFAULT"]) == 1) { $arrayNextTaskDefault = $arrayRouteData; - $arrayNextTask = array(); - break; + $flagDefault = true; + continue; } $flagContinue = true; @@ -216,7 +216,9 @@ class Derivation $arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData); } } - + if($flagDefault && !$flagContinue){ + $arrayNextTask = array(); + } if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) { $arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault); } From 2685c985d590fd40fbd1f7c8c212479533999867 Mon Sep 17 00:00:00 2001 From: "Paula V. Quispe" Date: Mon, 23 Feb 2015 18:00:19 -0400 Subject: [PATCH 3/3] I deleted a validation --- workflow/engine/classes/class.derivation.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 895b06998..d7ea9c5f3 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -207,7 +207,6 @@ class Derivation $flagContinue = false; } } - if ($arrayRouteData["ROU_TYPE"] == "EVALUATE" && count($arrayNextTask) > 0) { $flagContinue = false; } @@ -216,9 +215,6 @@ class Derivation $arrayNextTask[++$i] = $this->prepareInformationTask($arrayRouteData); } } - if($flagDefault && !$flagContinue){ - $arrayNextTask = array(); - } if (count($arrayNextTask) == 0 && count($arrayNextTaskDefault) > 0) { $arrayNextTask[++$i] = $this->prepareInformationTask($arrayNextTaskDefault); }