Changes for page Rangee Index

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

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

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,8 +1,6 @@
1 1  {{velocity}}
2 2  {{tree links="true" edges="false"}}
3 3  #set($depth = $wikimacro.parameters.depth)
4 -
5 -## Locale bestimmen
6 6  #set($locale = '')
7 7  #if ($xcontext.locale != 'de')
8 8   #set($locale = $xcontext.locale)
... ... @@ -13,19 +13,23 @@
13 13   #set($doc = $xwiki.getDocument($docFullName))
14 14   #set($translatedDoc = $doc.getTranslatedDocument())
15 15  
16 - ## Nur rendern wenn Sprache passt
17 - #if ($locale == $translatedDoc.getLanguage())
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'))
18 18   #set($cssClass = '')
19 - #if ($currentDepth < $depth)
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)
20 20   #set($cssClass = 'jstree-open')
21 21   #end
27 +
22 22   <li class="$cssClass">
23 23   [[$translatedDoc.getDisplayTitle()>>$translatedDoc.fullName]]
24 24  
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 -
29 29   ## Rekursiv rendern wenn Kinder vorhanden sind
30 30   #if ($children && $children.size() > 0 && $currentDepth < $depth)
31 31   #set($nextDepth = $currentDepth + 1)
... ... @@ -41,9 +41,9 @@
41 41  
42 42  {{html wiki=true}}
43 43  <ul>
44 - ## Root-Dokumente laden
46 + ## Root-Dokumente laden - OHNE currentlanguage Filter
45 45   #set($rootQuery = $services.query.xwql('where doc.parent = :doc and doc.hidden = 0 order by doc.title asc'))
46 - #set($rootDocs = $rootQuery.bindValue('doc', $doc.fullName).addFilter('currentlanguage').execute())
48 + #set($rootDocs = $rootQuery.bindValue('doc', $doc.fullName).execute())
47 47  
48 48   #foreach($docName in $rootDocs)
49 49   #renderTreeNode($docName 1)