Changes for page Rangee Index
Last modified by Tobias Wintrich on 2025/06/04 09:20
From version 12.57
edited by Tobias Wintrich
on 2021/09/28 13:10
on 2021/09/28 13:10
Change comment:
There is no comment for this version
To version 12.12
edited by Tobias Wintrich
on 2021/09/28 10:32
on 2021/09/28 10:32
Change comment:
There is no comment for this version
Summary
-
Objects (1 modified, 0 added, 0 removed)
Details
- XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -1,45 +1,33 @@ 1 1 {{velocity}} 2 - ##{{tree links="true" edges="false"}}2 +{{tree links="true" edges="false"}} 3 3 #set($depth = $wikimacro.parameters.depth) 4 -#if ($xcontext.locale == 'de') 5 - #set($locale = '') 6 -#else 7 - #set($locale = $xcontext.locale) 8 -#end 9 9 {{html wiki=true}} 10 10 <ul> 11 11 #set($results = false) 12 - #set ($query = $services.query.xwql('where doc.parent = :doc and doc.hidden = 0 order by doc.title asc')) 13 - #set($results = $query.bindValue('doc', $doc.fullName).addFilter('currentlanguage').execute()) 14 - $results 15 - #set($children =$doc.getChildren()) 16 - $sorter.sort($children, ["name:asc", "ordinal:desc"])) 7 + #set ($query = $services.query.xwql('where doc.parent = :doc and doc.hidden = 0 order by doc.title asc')) 8 + #set($results = $query.bindValue('doc', $doc.fullName).addFilter('currentlanguage').execute()) 17 17 #foreach($docname in $results) 18 18 #set($rdoc = $xwiki.getDocument($docname).getTranslatedDocument()) 19 - #if ($locale == $rdoc.getLanguage()) 20 - <li class=" 21 - #if ($depth > 0) 22 - jstree-open 23 - #end 24 - "> 25 - [[$rdoc.getDisplayTitle()>>$rdoc.fullName]] 26 - </li> 11 + <li class=" 12 + #if ($depth > 0) 13 + jstree-open 27 27 #end 15 + "> 16 + [[$rdoc.getDisplayTitle()>>$rdoc.fullName]] 17 + </li> 28 28 #set($results2 = false) 29 29 #set($query2 = $services.query.xwql('where doc.parent=:doc and doc.hidden = 0 order by doc.title asc')) 30 - #set($results2 = $query2.bindValue('doc', $docname).addFilter('currentlanguage').execute()) 20 + #set($results2 = $query2.bindValue('doc', $docname).addFilter('currentlanguage').execute()) 31 31 <ul> 32 32 #foreach($rdoc in $results2) 33 33 #set($rdoc2 = $xwiki.getDocument($rdoc).getTranslatedDocument()) 34 - #if ($locale == $rdoc2.getLanguage()) 35 - <li class=" 36 - #if ($depth > 1) 37 - jstree-open 38 - #end 39 - "> 40 - [[$rdoc2.getDisplayTitle()>>$rdoc2.fullName]] 41 - </li> 24 + <li class=" 25 + #if ($depth > 1) 26 + jstree-open 42 42 #end 28 + "> 29 + [[$rdoc2.getDisplayTitle()>>$rdoc2.fullName]] 30 + </li> 43 43 #set($results3 = false) 44 44 #set($query3 = $services.query.xwql('where doc.parent=:doc and doc.hidden = 0 order by doc.title asc')) 45 45 #set($results3 = $query3.bindValue('doc', $rdoc).addFilter('currentlanguage').execute()) ... ... @@ -46,7 +46,6 @@ 46 46 <ul> 47 47 #foreach($rdoc2 in $results3) 48 48 #set($rdoc3 = $xwiki.getDocument($rdoc2).getTranslatedDocument()) 49 - #if ($locale == $rdoc3.getLanguage()) 50 50 <li class=" 51 51 #if ($depth > 2) 52 52 jstree-open ... ... @@ -54,7 +54,6 @@ 54 54 "> 55 55 [[$rdoc3.getDisplayTitle()>>$rdoc3.fullName]] 56 56 </li> 57 - #end 58 58 #set($results4 = false) 59 59 #set($query4 = $services.query.xwql('where doc.parent=:doc and doc.hidden = 0 order by doc.title asc')) 60 60 #set($results4 = $query4.bindValue('doc', $rdoc2).addFilter('currentlanguage').execute()) ... ... @@ -61,7 +61,6 @@ 61 61 <ul> 62 62 #foreach($rdoc3 in $results4) 63 63 #set($rdoc4 = $xwiki.getDocument($rdoc3).getTranslatedDocument()) 64 - #if ($locale == $rdoc4.getLanguage()) 65 65 <li class=" 66 66 #if ($depth > 3) 67 67 jstree-open ... ... @@ -69,7 +69,6 @@ 69 69 "> 70 70 [[$rdoc4.getDisplayTitle()>>$rdoc4.fullName]] 71 71 </li> 72 - #end 73 73 #set($results5 = false) 74 74 #set($query5 = $services.query.xwql('where doc.parent=:doc and doc.hidden = 0 order by doc.title asc')) 75 75 #set($results5 = $query3.bindValue('doc', $rdoc3).addFilter('currentlanguage').execute()) ... ... @@ -76,7 +76,6 @@ 76 76 <ul> 77 77 #foreach($rdoc4 in $results5) 78 78 #set($rdoc5 = $xwiki.getDocument($rdoc4).getTranslatedDocument()) 79 - #if ($locale == $rdoc5.getLanguage()) 80 80 <li class=" 81 81 #if ($depth > 4) 82 82 jstree-open ... ... @@ -84,7 +84,6 @@ 84 84 "> 85 85 [[$rdoc5.getDisplayTitle()>>$rdoc5.fullName]] 86 86 </li> 87 - #end 88 88 #end 89 89 </ul> 90 90 #end ... ... @@ -97,5 +97,5 @@ 97 97 </ul> 98 98 99 99 {{/html}} 100 - ##{{/tree}}82 +{{/tree}} 101 101 {{/velocity}}