Skip to Content
0 Votes

Changes for page Document Tree Macros

Last modified by ztx lyghters on 2025/10/28 11:47
From 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]
To 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]

Summary

Details

Page properties
Content
... ... @@ -152,8 +152,6 @@
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)
157 157   #end
158 158   #if ($nodeId == '#' && $docTreeConfig.showRoot)
159 159   #maybeAddNode($actualNodeId $children)
... ... @@ -288,7 +288,7 @@
288 288  
289 289  #macro (addSpaceNode $spaceReference $siblings)
290 290   #set ($spaceId = $services.model.serialize($spaceReference, 'default'))
291 - #set ($spaceNodeId = "space:$spaceId")
289 + #set ($nodeId = "space:$spaceId")
292 292   #set ($hasSpaceAdmin = $services.security.authorization.hasAccess('admin', $spaceReference))
293 293   #set ($canViewSpace = $services.security.authorization.hasAccess('view', $spaceReference))
294 294   #if ($docTreeConfig.showTerminalDocuments)
... ... @@ -296,7 +296,7 @@
296 296   #set ($hasChildren = true)
297 297   #else
298 298   ## We display only the nested spaces. This space might contain only documents.
299 - #set ($hasChildren = $tree.getChildCount($spaceNodeId) > 0)
297 + #set ($hasChildren = $tree.getChildCount($nodeId) > 0)
300 300   #end
301 301   #set ($isOpened = false)
302 302   #if ("$!docTreeConfig.expandToLevel" != '')
... ... @@ -306,11 +306,11 @@
306 306   #else
307 307   #set ($rootNode = $docTreeConfig.root)
308 308   #end
309 - #set ($rootDistance = $tree.getPath($spaceNodeId).size())
307 + #set ($rootDistance = $tree.getPath($nodeId).size())
310 310   #set ($isOpened = ($rootDistance != -1 && $docTreeConfig.expandToLevel >= $rootDistance))
311 311   #end
312 312   #set ($discard = $siblings.add({
313 - 'id': $spaceNodeId,
311 + 'id': $nodeId,
314 314   'text': $spaceReference.name,
315 315   'icon': 'fa fa-folder-o',
316 316   'iconOpened': 'fa fa-folder-open-o',
... ... @@ -356,7 +356,7 @@
356 356  
357 357  #macro (addDocumentNode $documentReference $siblings)
358 358   #set ($documentId = $services.model.serialize($documentReference, 'default'))
359 - #set ($docNodeId = "document:$documentId")
357 + #set ($nodeId = "document:$documentId")
360 360   #set ($label = $documentReference.name)
361 361   #if (!$docTreeConfig.showSpaces &&
362 362   $documentReference.name == $services.model.getEntityReference('DOCUMENT', 'default').name)
... ... @@ -373,7 +373,7 @@
373 373   #set ($label = $plainTitle)
374 374   #end
375 375   #end
376 - #set ($hasChildren = $tree.getChildCount($docNodeId) > 0)
374 + #set ($hasChildren = $tree.getChildCount($nodeId) > 0)
377 377   #set ($isOpened = false)
378 378   #if ("$!docTreeConfig.expandToLevel" != '')
379 379   #set ($rootNode = "wiki:$services.wiki.currentWikiId")
... ... @@ -382,11 +382,11 @@
382 382   #else
383 383   #set ($rootNode = $docTreeConfig.root)
384 384   #end
385 - #set ($rootDistance = $tree.getPath($docNodeId).size())
383 + #set ($rootDistance = $tree.getPath($nodeId).size())
386 386   #set ($isOpened = ($rootDistance != -1 && $docTreeConfig.expandToLevel >= $rootDistance))
387 387   #end
388 388   #set ($discard = $siblings.add({
389 - 'id': $docNodeId,
387 + 'id': $nodeId,
390 390   'text': $label,
391 391   'icon': 'fa fa-file-o',
392 392   'children': $hasChildren,