Skip to Content
0 Votes

Changes for page Document Tree Macros

Last modified by ztx lyghters on 2025/10/28 11:47
From version 2.1
edited by ztx lyghters
on 2025/10/03 09:34
Change comment: Install extension [org.xwiki.platform:xwiki-platform-index-tree-macro/17.3.0]
To version 3.1
edited by ztx lyghters
on 2025/10/28 11:47
Change comment: Install extension [org.xwiki.platform:xwiki-platform-index-tree-macro/17.7.0]

Summary

Details

Page properties
Content
... ... @@ -152,6 +152,8 @@
152 152   #set ($limit = $mathtool.max($numbertool.toNumber($request.limit).intValue(), 1))
153 153   #if ("$!limit" == '')
154 154   #set ($limit = 15)
155 + #else
156 + #validateQueryLimit($limit)
155 155   #end
156 156   #if ($nodeId == '#' && $docTreeConfig.showRoot)
157 157   #maybeAddNode($actualNodeId $children)
... ... @@ -286,7 +286,7 @@
286 286  
287 287  #macro (addSpaceNode $spaceReference $siblings)
288 288   #set ($spaceId = $services.model.serialize($spaceReference, 'default'))
289 - #set ($nodeId = "space:$spaceId")
291 + #set ($spaceNodeId = "space:$spaceId")
290 290   #set ($hasSpaceAdmin = $services.security.authorization.hasAccess('admin', $spaceReference))
291 291   #set ($canViewSpace = $services.security.authorization.hasAccess('view', $spaceReference))
292 292   #if ($docTreeConfig.showTerminalDocuments)
... ... @@ -294,7 +294,7 @@
294 294   #set ($hasChildren = true)
295 295   #else
296 296   ## We display only the nested spaces. This space might contain only documents.
297 - #set ($hasChildren = $tree.getChildCount($nodeId) > 0)
299 + #set ($hasChildren = $tree.getChildCount($spaceNodeId) > 0)
298 298   #end
299 299   #set ($isOpened = false)
300 300   #if ("$!docTreeConfig.expandToLevel" != '')
... ... @@ -304,11 +304,11 @@
304 304   #else
305 305   #set ($rootNode = $docTreeConfig.root)
306 306   #end
307 - #set ($rootDistance = $tree.getPath($nodeId).size())
309 + #set ($rootDistance = $tree.getPath($spaceNodeId).size())
308 308   #set ($isOpened = ($rootDistance != -1 && $docTreeConfig.expandToLevel >= $rootDistance))
309 309   #end
310 310   #set ($discard = $siblings.add({
311 - 'id': $nodeId,
313 + 'id': $spaceNodeId,
312 312   'text': $spaceReference.name,
313 313   'icon': 'fa fa-folder-o',
314 314   'iconOpened': 'fa fa-folder-open-o',
... ... @@ -354,7 +354,7 @@
354 354  
355 355  #macro (addDocumentNode $documentReference $siblings)
356 356   #set ($documentId = $services.model.serialize($documentReference, 'default'))
357 - #set ($nodeId = "document:$documentId")
359 + #set ($docNodeId = "document:$documentId")
358 358   #set ($label = $documentReference.name)
359 359   #if (!$docTreeConfig.showSpaces &&
360 360   $documentReference.name == $services.model.getEntityReference('DOCUMENT', 'default').name)
... ... @@ -371,7 +371,7 @@
371 371   #set ($label = $plainTitle)
372 372   #end
373 373   #end
374 - #set ($hasChildren = $tree.getChildCount($nodeId) > 0)
376 + #set ($hasChildren = $tree.getChildCount($docNodeId) > 0)
375 375   #set ($isOpened = false)
376 376   #if ("$!docTreeConfig.expandToLevel" != '')
377 377   #set ($rootNode = "wiki:$services.wiki.currentWikiId")
... ... @@ -380,11 +380,11 @@
380 380   #else
381 381   #set ($rootNode = $docTreeConfig.root)
382 382   #end
383 - #set ($rootDistance = $tree.getPath($nodeId).size())
385 + #set ($rootDistance = $tree.getPath($docNodeId).size())
384 384   #set ($isOpened = ($rootDistance != -1 && $docTreeConfig.expandToLevel >= $rootDistance))
385 385   #end
386 386   #set ($discard = $siblings.add({
387 - 'id': $nodeId,
389 + 'id': $docNodeId,
388 388   'text': $label,
389 389   'icon': 'fa fa-file-o',
390 390   'children': $hasChildren,