From d6697e922342f8efedf9ce38d3e887909ef13e5c Mon Sep 17 00:00:00 2001 From: Kevin Roast Date: Wed, 20 Jan 2010 10:42:32 +0000 Subject: [PATCH] Merged V3.2E to HEAD 17623: ETHREEOH-1733 - fix for multiday events that x weeks long exactly 17625: Fix for ETHREEOH-3468 - Missing null check in WebScript AbstractRuntime when an authenticator is not provided by the Runtime. 17626: missed checkin file for ETHREEOH-1733 fix 17627: Undid change fix for ETHREEOH-1229: Can't delete space that contains "translation without content" - I can't see how this affects the build but one has to start somewhere 17628: Added a getParentAssocs in test to help diagnose failure cause 17629: ETHREEOH-3062 - Minimize Share treeview load during expansion 17630: Fix unreported issue where argsM values are incorrect when more than one parameter present on the URL in SURF local WebScript request. Also minor performance improvements to SURF/WSF after profiling tests. git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18161 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../slingshot/documentlibrary/treenode.get.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.js b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.js index e51948c6ea..717808bc4c 100644 --- a/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.js +++ b/config/alfresco/templates/webscripts/org/alfresco/slingshot/documentlibrary/treenode.get.js @@ -11,13 +11,14 @@ function getTreenode(siteId, path) try { var items = new Array(), - hasSubfolders, + hasSubfolders = true, ignoredTypes = { "{http://www.alfresco.org/model/forum/1.0}forum": true, "{http://www.alfresco.org/model/forum/1.0}topic": true, "{http://www.alfresco.org/model/content/1.0}systemfolder": true - }; + }, + evalChildFolders = args["children"] !== "false"; // Use helper function to get the arguments var parsedArgs = ParseArgs.getParsedArgs(); @@ -27,11 +28,14 @@ function getTreenode(siteId, path) } // Look for folders in the parentNode - for each(item in parsedArgs.parentNode.children) + for each (item in parsedArgs.parentNode.children) { if (item.isSubType("cm:folder") && !(item.type in ignoredTypes)) { - hasSubfolders = item.childFileFolders(false, true, "fm:forum").length > 0; + if (evalChildFolders) + { + hasSubfolders = item.childFileFolders(false, true, "fm:forum").length > 0; + } items.push( {