From ac4b24746c36cbb42a07decb589ded90474910fb Mon Sep 17 00:00:00 2001
From: Hector Cortez <hector@colosa.com>
Date: Thu, 25 Apr 2013 11:33:45 -0400
Subject: [PATCH] BUG 0000 Problems Moving a folder in the Document option
 SOLVED

- Problems Moving a folder in the Document option
- Adjustment and Validation to Moving a folder in the Document option.
---
 .../engine/methods/appFolder/appFolderAjax.php  | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php
index 8d71ad3f4..74793901c 100755
--- a/workflow/engine/methods/appFolder/appFolderAjax.php
+++ b/workflow/engine/methods/appFolder/appFolderAjax.php
@@ -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");