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

BUG 0000 Problems Moving a folder in the Document option SOLVED

Browse Source 
- Problems Moving a folder in the Document option
- Adjustment and Validation to Moving a folder in the Document option.
This commit is contained in:
Hector Cortez
2013-04-25 11:33:45 -04:00
parent e7e4b46ddd
commit ac4b24746c
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -909,12 +909,18 @@ function copyMoveAction($type)
$paths = array(); $paths = array();
$folderResult = findChilds('/', '', $paths); $folderResult = findChilds('/', '', $paths);
$withCombo = 30; $withCombo = 30;
$folderSelected = $oPMFolder->load($dir);
$root = array("/","/");
array_unshift ($folderResult, $root);
$folderResultSel = array();
foreach ($folderResult as $key => $value) { foreach ($folderResult as $key => $value) {
$count = strlen($value[1]); $count = strlen($value[1]);
$withCombo = ($count>$withCombo) ? $count : $withCombo; $withCombo = ($count>$withCombo) ? $count : $withCombo;
if ($folderSelected['FOLDER_PARENT_UID'] != $value[0] && $dir != $value[0]) {
$folderResultSel[] = $value;
}
} }
$root = array("/","/");
array_unshift ($folderResult,$root);
$dirCompletePath=$oPMFolder->getFolderStructure($dir); $dirCompletePath=$oPMFolder->getFolderStructure($dir);
$copyDialog["xtype"] = "form"; $copyDialog["xtype"] = "form";
@@ -939,7 +945,7 @@ function copyMoveAction($type)
$itemField["name"] = "new_dir_label"; $itemField["name"] = "new_dir_label";
$itemField["mode"] = "local"; $itemField["mode"] = "local";
$itemField["triggerAction"] = "all"; $itemField["triggerAction"] = "all";
$itemField["store"] = $folderResult; $itemField["store"] = $folderResultSel;
$itemField["valueField"] = "FOLDER_UID"; $itemField["valueField"] = "FOLDER_UID";
$itemField["editable"] = false; $itemField["editable"] = false;
$itemField["displayField"] = "FOLDER_NAME"; $itemField["displayField"] = "FOLDER_NAME";
@@ -1100,6 +1106,11 @@ function copyMoveExecuteTree($uidFolder, $newUidFolder)
$appFoder = new AppFolder (); $appFoder = new AppFolder ();
$folderContent = $appFoder->getFolderContent($uidFolder); $folderContent = $appFoder->getFolderContent($uidFolder);
$folderOrigin = $appFoder->getFolderStructure($uidFolder); $folderOrigin = $appFoder->getFolderStructure($uidFolder);
if ($newUidFolder == $folderOrigin[$uidFolder]['PARENT'] && $_REQUEST['action'] == 'moveExecute') {
return $uidFolder;
}
$FolderParentUid = trim($newUidFolder);//$form['FOLDER_PARENT_UID']; $FolderParentUid = trim($newUidFolder);//$form['FOLDER_PARENT_UID'];
$FolderName = $folderOrigin[$uidFolder]['NAME']; $FolderName = $folderOrigin[$uidFolder]['NAME'];
$newFolderContent = $appFoder->createFolder ($FolderName, $FolderParentUid, "new"); $newFolderContent = $appFoder->createFolder ($FolderName, $FolderParentUid, "new");