Merged in caleeli/processmaker/HOR-659 (pull request #4018)

HOR-659

workflow/engine/methods/appFolder/appFolderAjax.php

@@ -1374,7 +1374,10 @@ function copyMoveExecuteTree($uidFolder, $newUidFolder)
 {
     require_once ("classes/model/AppDocument.php");
     require_once ('classes/model/AppFolder.php');
-
+    if($newUidFolder==="root") {
+        return $newUidFolder;
+    }
+    
     $appFoder = new AppFolder ();
     $folderContent = $appFoder->getFolderContent($uidFolder);
     $folderOrigin = $appFoder->getFolderStructure($uidFolder);

workflow/engine/templates/cases/casesDocuments.js

@@ -1601,7 +1601,6 @@ function copymove(action) {
     // '+ dropEvent.target.id.replace( /_RRR_/g, '/' ));
     requestParams = getRequestParams();
     if (!((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1))) {
-        Ext.getCmp("dirTreePanel").getRootNode().reload();    
         document.getElementById('ext-gen20').style.visibility='hidden';
         document.getElementsByClassName('x-shadow')[0].style.visibility='hidden';          
         parent.frames[0].location.href="casesStartPage?action=documents";
@@ -1837,19 +1836,28 @@ var treepanelmain = new Ext.tree.TreePanel({
       'beforenodedrop' : {
         fn : function(e) {
           if (!((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1))) {
-            dropEvent = e;
+              if(typeof e.target==="object" && e.target.id==="root"){
-            copymoveCtx(e);
+                e.dropStatus=true;
-            datastore.reload();
+                return false;
+              }
+              setTimeout(
+                (function(e,datastore){
+                  return function(){
+                    dropEvent = e;
+                    copymoveCtx(e);
+                    datastore.load();
+                  }
+                })(e,datastore),
+                0
+              );
           }
+          e.dropStatus=true;
+          return false;
         }
       },
       'nodedrop' : {
         fn : function(e) { 
-          if ((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1)) {
+          return false;
-              dropEvent = e;
-                copymoveCtx(e);
-                datastore.reload();
-          }
         }
       },
       'beforemove' : {