From 31734dfe0687904297a84c1922ea300566763afb Mon Sep 17 00:00:00 2001 From: davidcallizaya Date: Thu, 31 Mar 2016 12:31:38 -0400 Subject: [PATCH] HOR-659 Documents>Move>Uncaught TypeError: Cannot read property 'isLeaf' of null(anonymous function) @ ext-all.js:78h.Event.fire @ ext-all.js:2h.Observable.fireEvent ......... c Fixed move folder functionality + Added validation to avoid move folder directly to root folder --- .../methods/appFolder/appFolderAjax.php | 5 +++- .../engine/templates/cases/casesDocuments.js | 26 ++++++++++++------- 2 files changed, 21 insertions(+), 10 deletions(-) diff --git a/workflow/engine/methods/appFolder/appFolderAjax.php b/workflow/engine/methods/appFolder/appFolderAjax.php index 515278fed..cebdfdc34 100755 --- a/workflow/engine/methods/appFolder/appFolderAjax.php +++ b/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); diff --git a/workflow/engine/templates/cases/casesDocuments.js b/workflow/engine/templates/cases/casesDocuments.js index dd83f42d0..1640f345b 100755 --- a/workflow/engine/templates/cases/casesDocuments.js +++ b/workflow/engine/templates/cases/casesDocuments.js @@ -1598,7 +1598,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"; @@ -1834,19 +1833,28 @@ var treepanelmain = new Ext.tree.TreePanel({ 'beforenodedrop' : { fn : function(e) { if (!((navigator.userAgent.indexOf("MSIE") != -1) || (navigator.userAgent.indexOf("Trident") != -1))) { - dropEvent = e; - copymoveCtx(e); - datastore.reload(); + if(typeof e.target==="object" && e.target.id==="root"){ + e.dropStatus=true; + 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)) { - dropEvent = e; - copymoveCtx(e); - datastore.reload(); - } + return false; } }, 'beforemove' : {