Changes for page Rangee Index

Last modified by Tobias Wintrich on 2025/10/31 08:26

From version 20.4
edited by Tobias Wintrich
on 2025/10/15 08:15
Change comment: There is no comment for this version
To version 20.3
edited by Tobias Wintrich
on 2025/10/15 08:13
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,6 +1,8 @@
1 1  {{velocity}}
2 2  {{tree links="true" edges="false"}}
3 3  #set($depth = $wikimacro.parameters.depth)
4 +
5 +## Locale bestimmen
4 4  #set($locale = '')
5 5  #if ($xcontext.locale != 'de')
6 6   #set($locale = $xcontext.locale)
... ... @@ -11,23 +11,19 @@
11 11   #set($doc = $xwiki.getDocument($docFullName))
12 12   #set($translatedDoc = $doc.getTranslatedDocument())
13 13  
14 - ## Nur rendern wenn Sprache passt (leerer locale matched alles für Standardsprache)
15 - #set($docLang = $translatedDoc.getLanguage())
16 - #if ($locale == '' || $locale == $docLang || ($locale == '' && $docLang == 'de'))
16 + ## Nur rendern wenn Sprache passt
17 + #if ($locale == $translatedDoc.getLanguage())
17 17   #set($cssClass = '')
18 -
19 - ## Kinder-Dokumente abfragen - OHNE currentlanguage Filter
20 - #set($childQuery = $services.query.xwql('where doc.parent = :parentDoc and doc.hidden = 0 order by doc.title asc'))
21 - #set($children = $childQuery.bindValue('parentDoc', $docFullName).execute())
22 -
23 - ## CSS-Klasse nur wenn Kinder existieren UND Tiefe noch nicht erreicht
24 - #if ($children && $children.size() > 0 && $currentDepth < $depth)
19 + #if ($currentDepth < $depth)
25 25   #set($cssClass = 'jstree-open')
26 26   #end
27 -
28 28   <li class="$cssClass">
29 29   [[$translatedDoc.getDisplayTitle()>>$translatedDoc.fullName]]
30 30  
25 + ## Kinder-Dokumente abfragen
26 + #set($childQuery = $services.query.xwql('where doc.parent = :parentDoc and doc.hidden = 0 order by doc.title asc'))
27 + #set($children = $childQuery.bindValue('parentDoc', $docFullName).addFilter('currentlanguage').execute())
28 +
31 31   ## Rekursiv rendern wenn Kinder vorhanden sind
32 32   #if ($children && $children.size() > 0 && $currentDepth < $depth)
33 33   #set($nextDepth = $currentDepth + 1)
... ... @@ -43,9 +43,9 @@
43 43  
44 44  {{html wiki=true}}
45 45  <ul>
46 - ## Root-Dokumente laden - OHNE currentlanguage Filter
44 + ## Root-Dokumente laden
47 47   #set($rootQuery = $services.query.xwql('where doc.parent = :doc and doc.hidden = 0 order by doc.title asc'))
48 - #set($rootDocs = $rootQuery.bindValue('doc', $doc.fullName).execute())
46 + #set($rootDocs = $rootQuery.bindValue('doc', $doc.fullName).addFilter('currentlanguage').execute())
49 49  
50 50   #foreach($docName in $rootDocs)
51 51   #renderTreeNode($docName 1)