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 1.1
edited by ztx lyghters
on 2025/01/31 15:59
Change comment: Install extension [org.xwiki.platform:xwiki-platform-index-tree-macro/17.0.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)
... ... @@ -207,7 +207,6 @@
207 207  
208 208  #macro (maybeAddFarmNode $nodeReference $siblings)
209 209   #set ($farmHomeReference = $services.model.resolveDocument('', 'default'))
210 - #set ($isOpened = $docTreeConfig.expandToLevel > 0)
211 211   #set ($discard = $siblings.add({
212 212   'id': 'farm:*',
213 213   'text': 'Farm',
... ... @@ -217,9 +217,6 @@
217 217   'type': 'farm',
218 218   'validChildren': ['wiki', 'pagination']
219 219   },
220 - 'state': {
221 - 'opened': $isOpened
222 - },
223 223   'a_attr': {
224 224   'href': $xwiki.getURL($farmHomeReference)
225 225   }
... ... @@ -248,7 +248,6 @@
248 248   #else
249 249   #set ($label = $wiki.id)
250 250   #end
251 - #set ($isOpened = $docTreeConfig.expandToLevel > 0)
252 252   #set ($discard = $siblings.add({
253 253   'id': "wiki:$wiki.id",
254 254   'text': $label,
... ... @@ -260,9 +260,6 @@
260 260   'validChildren': ['space', 'document', 'pagination'],
261 261   'canDelete': $canDeleteWiki
262 262   },
263 - 'state': {
264 - 'opened': $isOpened
265 - },
266 266   'a_attr': {
267 267   'href': $xwiki.getURL($wiki.mainPageReference)
268 268   }
... ... @@ -288,7 +288,6 @@
288 288  
289 289  #macro (addSpaceNode $spaceReference $siblings)
290 290   #set ($spaceId = $services.model.serialize($spaceReference, 'default'))
291 - #set ($spaceNodeId = "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,21 +296,10 @@
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)
288 + #set ($hasChildren = $tree.getChildCount("space:$spaceId") > 0)
300 300   #end
301 - #set ($isOpened = false)
302 - #if ("$!docTreeConfig.expandToLevel" != '')
303 - #set ($rootNode = "wiki:$services.wiki.currentWikiId")
304 - #if ("$!docTreeConfig.root" != '')
305 - #set ($rootNode = "wiki:$services.wiki.currentWikiId")
306 - #else
307 - #set ($rootNode = $docTreeConfig.root)
308 - #end
309 - #set ($rootDistance = $tree.getPath($spaceNodeId).size())
310 - #set ($isOpened = ($rootDistance != -1 && $docTreeConfig.expandToLevel >= $rootDistance))
311 - #end
312 312   #set ($discard = $siblings.add({
313 - 'id': $spaceNodeId,
291 + 'id': "space:$spaceId",
314 314   'text': $spaceReference.name,
315 315   'icon': 'fa fa-folder-o',
316 316   'iconOpened': 'fa fa-folder-open-o',
... ... @@ -328,9 +328,6 @@
328 328   'createDocumentURL': $xwiki.getURL($spaceReference, 'create', $NULL),
329 329   'deleteURL': $xwiki.getURL($spaceReference, 'deletespace', $NULL)
330 330   },
331 - 'state': {
332 - 'opened': $isOpened
333 - },
334 334   'a_attr': {
335 335   'href': $xwiki.getURL($spaceReference)
336 336   }
... ... @@ -356,7 +356,6 @@
356 356  
357 357  #macro (addDocumentNode $documentReference $siblings)
358 358   #set ($documentId = $services.model.serialize($documentReference, 'default'))
359 - #set ($docNodeId = "document:$documentId")
360 360   #set ($label = $documentReference.name)
361 361   #if (!$docTreeConfig.showSpaces &&
362 362   $documentReference.name == $services.model.getEntityReference('DOCUMENT', 'default').name)
... ... @@ -373,20 +373,9 @@
373 373   #set ($label = $plainTitle)
374 374   #end
375 375   #end
376 - #set ($hasChildren = $tree.getChildCount($docNodeId) > 0)
377 - #set ($isOpened = false)
378 - #if ("$!docTreeConfig.expandToLevel" != '')
379 - #set ($rootNode = "wiki:$services.wiki.currentWikiId")
380 - #if ("$!docTreeConfig.root" != '')
381 - #set ($rootNode = "wiki:$services.wiki.currentWikiId")
382 - #else
383 - #set ($rootNode = $docTreeConfig.root)
384 - #end
385 - #set ($rootDistance = $tree.getPath($docNodeId).size())
386 - #set ($isOpened = ($rootDistance != -1 && $docTreeConfig.expandToLevel >= $rootDistance))
387 - #end
350 + #set ($hasChildren = $tree.getChildCount("document:$documentId") > 0)
388 388   #set ($discard = $siblings.add({
389 - 'id': $docNodeId,
352 + 'id': "document:$documentId",
390 390   'text': $label,
391 391   'icon': 'fa fa-file-o',
392 392   'children': $hasChildren,
... ... @@ -401,9 +401,6 @@
401 401   'canCopy': $canViewDoc,
402 402   'createDocumentURL': $xwiki.getURL($documentReference, 'create', $NULL)
403 403   },
404 - 'state': {
405 - 'opened': $isOpened
406 - },
407 407   'a_attr': {
408 408   'href': $xwiki.getURL($documentReference)
409 409   }