mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-21 18:09:20 +00:00
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
This commit is contained in:
@@ -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();
|
||||
@@ -30,8 +31,11 @@ function getTreenode(siteId, path)
|
||||
for each (item in parsedArgs.parentNode.children)
|
||||
{
|
||||
if (item.isSubType("cm:folder") && !(item.type in ignoredTypes))
|
||||
{
|
||||
if (evalChildFolders)
|
||||
{
|
||||
hasSubfolders = item.childFileFolders(false, true, "fm:forum").length > 0;
|
||||
}
|
||||
|
||||
items.push(
|
||||
{
|
||||
|
Reference in New Issue
Block a user