Changes for page Rangee Index
Last modified by Tobias Wintrich on 2025/06/04 09:20
From version 12.38
edited by Tobias Wintrich
on 2021/09/28 12:21
on 2021/09/28 12:21
Change comment:
There is no comment for this version
To version 12.42
edited by Tobias Wintrich
on 2021/09/28 12:28
on 2021/09/28 12:28
Change comment:
There is no comment for this version
Summary
-
Objects (1 modified, 0 added, 0 removed)
Details
- XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -1,5 +1,5 @@ 1 1 {{velocity}} 2 - ##{{tree links="true" edges="false"}}2 +{{tree links="true" edges="false"}} 3 3 #set($depth = $wikimacro.parameters.depth) 4 4 #if ($xcontext.locale == 'de') 5 5 #set($locale = '') ... ... @@ -7,10 +7,9 @@ 7 7 #set($locale = $xcontext.locale) 8 8 #end 9 9 {{html wiki=true}} 10 -language $locale 11 11 <ul> 12 12 #set($results = false) 13 - #set ($query = $services.query.xwql('where doc.parent = :doc and doc.hidden = 0 order by doc.title asc')) 12 + #set ($query = $services.query.xwql('where doc.parent = :doc and doc.hidden = 0 and doc.language=en order by doc.title asc')) 14 14 #set($results = $query.bindValue('doc', $doc.fullName).addFilter('currentlanguage').execute()) 15 15 #foreach($docname in $results) 16 16 #set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument()) ... ... @@ -59,6 +59,7 @@ 59 59 <ul> 60 60 #foreach($rdoc3 in $results4) 61 61 #set($rdoc4 = $xwiki.getDocument($rdoc3).getTranslatedDocument()) 61 + #if ($locale == $rdoc4.getLanguage()) 62 62 <li class=" 63 63 #if ($depth > 3) 64 64 jstree-open ... ... @@ -66,6 +66,7 @@ 66 66 "> 67 67 [[$rdoc4.getDisplayTitle()>>$rdoc4.fullName]] 68 68 </li> 69 + #end 69 69 #set($results5 = false) 70 70 #set($query5 = $services.query.xwql('where doc.parent=:doc and doc.hidden = 0 order by doc.title asc')) 71 71 #set($results5 = $query3.bindValue('doc', $rdoc3).addFilter('currentlanguage').execute()) ... ... @@ -72,6 +72,7 @@ 72 72 <ul> 73 73 #foreach($rdoc4 in $results5) 74 74 #set($rdoc5 = $xwiki.getDocument($rdoc4).getTranslatedDocument()) 76 + #if ($locale == $rdoc5.getLanguage()) 75 75 <li class=" 76 76 #if ($depth > 4) 77 77 jstree-open ... ... @@ -79,6 +79,7 @@ 79 79 "> 80 80 [[$rdoc5.getDisplayTitle()>>$rdoc5.fullName]] 81 81 </li> 84 + #end 82 82 #end 83 83 </ul> 84 84 #end ... ... @@ -91,5 +91,5 @@ 91 91 </ul> 92 92 93 93 {{/html}} 94 - ##{{/tree}}97 +{{/tree}} 95 95 {{/velocity}}