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

Merge branch 'master' of git://github.com/colosa/processmaker into BUG-0000

Browse Source
This commit is contained in:
Victor Saisa Lopez
2013-04-25 12:40:21 -04:00
parent bec54b1f19 7ebf3f4627
commit 263d20ef49
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/model/Configuration.php
View File

@@ -24,7 +24,9 @@
*
*/
//require_once 'classes/model/om/BaseConfiguration.php';
if (!class_exists('BaseConfiguration')) {
require_once 'classes/model/om/BaseConfiguration.php';
}
//require_once 'classes/model/Content.php';

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

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