fernando/luos
1
0
Fork 0
Code Releases Activity

PM-735 "En Documents, cuando se copia un arbol de directorios a otra carpeta..." SOLVED

Browse Source 
Issue:
    En Documents, cuando se copia un arbol de directorios a otra carpeta, no se copia la ultima carpeta del arbol
Cause:
    Al realizar la copia del directorio origen solo copia 2 niveles del directorio (el directorio seleccionado y sus hijos)
Solution:
    - Se ha reemplazado a linea:
        copyMoveExecuteTree($value['FOLDER_UID'],$newFoldercontent);
        por
        checkTree($value["FOLDER_UID"], $newFoldercontent);
    - Se ha completado codigo para que copie el contenido de cada directorio (los archivos del directorio)
This commit is contained in:
Victor Saisa Lopez
2014-10-27 17:40:21 -04:00
parent ccf65ed888
commit b368858622
1 changed files with 23 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
workflow/engine/methods/appFolder/appFolderAjax.php
View File

@@ -1140,7 +1140,8 @@ function moveAction()
copyMoveAction("move");
}
function findChilds($uidFolder, $path, $arrayPath) {
function findChilds($uidFolder, $path, $arrayPath)
{
$Criteria = new Criteria ();
$Criteria->addSelectColumn ( AppFolderPeer::FOLDER_UID );
$Criteria->addSelectColumn ( AppFolderPeer::FOLDER_PARENT_UID );
@@ -1347,7 +1348,8 @@ function documentVersionHistory()
G::RenderPage ('publish', 'raw');
}
function overwriteFile ($node, $fileName) {
function overwriteFile($node, $fileName)
{
global $RBAC;
require_once ("classes/model/AppFolder.php");
require_once ("classes/model/AppDocument.php");
@@ -1391,8 +1393,24 @@ function copyMoveExecuteTree($uidFolder, $newUidFolder)
$docInfo['APP_DOC_CREATE_DATE'] = date('Y-m-d H:i:s');
$docInfo['APP_DOC_STATUS'] = 'ACTIVE';
if ($action == 'copyExecute') {
$path = PATH_DOCUMENT . G::getPathFromUID($docInfo["APP_UID"]) . PATH_SEP;
$arrayInfo = pathinfo($docInfo["APP_DOC_FILENAME"]);
$extension = (isset($arrayInfo["extension"])? $arrayInfo["extension"] : "");
$arrayPathFromFile = G::getPathFromFileUID($docInfo["APP_UID"], $docInfo["APP_DOC_UID"]);
$originFile = $arrayPathFromFile[0] . PATH_SEP . $arrayPathFromFile[1] . "_" . $docInfo["DOC_VERSION"] . "." . $extension;
//Create Document
unset($docInfo['APP_DOC_UID']);
$docUid = $appDocument->create($docInfo);
//Copy file
$arrayPathFromFile = G::getPathFromFileUID($docInfo["APP_UID"], $docUid);
$newFile = $arrayPathFromFile[0] . PATH_SEP . $arrayPathFromFile[1] . "_" . $docInfo["DOC_VERSION"] . "." . $extension;
copy($path . $originFile, $path . $newFile);
} else {
$appDocument->update($docInfo);
}
@@ -1406,9 +1424,10 @@ function checkTree ($uidOriginFolder, $uidNewFolder)
$appFoder = new AppFolder ();
$newFoldercontent = copyMoveExecuteTree($uidOriginFolder, $uidNewFolder);
$listfolder = $appFoder->getFolderList($uidOriginFolder);
if (count($listfolder)>0) {
foreach ($listfolder['folders'] as $key => $value) {
copyMoveExecuteTree($value['FOLDER_UID'],$newFoldercontent);
checkTree($value["FOLDER_UID"], $newFoldercontent);
}
} else {
return;
@@ -1423,7 +1442,6 @@ function uploadExternalDocument()
$response['success']=false;
$overwrite = (isset($_REQUEST['overwrite_files'])) ? $_REQUEST['overwrite_files'] : false;
if (isset($_POST["confirm"]) && $_POST["confirm"] == "true") {
//G::pr($_FILES);
if (isset($_FILES['uploadedFile'])) {
$uploadedInstances=count($_FILES['uploadedFile']['name']);
$sw_error=false;
@@ -1916,7 +1934,7 @@ function get_abs_item($dir, $item)
return extPathName(get_abs_dir($dir)."/".$item);
}
function extPathName($p_path, $p_addtrailingslash=false)
function extPathName($p_path, $p_addtrailingslash = false)
{
$retval = "";