Skip to Content

Changes for page Macros

Last modified by SuperNico Laub on 2025/09/18 17:55
From version 1.1
edited by superadmin
on 2025/05/22 17:45
Change comment: Install extension [org.xwiki.platform:xwiki-platform-tour-ui/16.10.8]
To version 2.1
edited by SuperNico Laub
on 2025/09/18 17:55
Change comment: Install extension [org.xwiki.platform:xwiki-platform-tour-ui/17.7.0]

Summary

Details

Page properties
Author
... ... @@ -1,1 +1,1 @@
1 -XWiki.superadmin
1 +xwiki:XWiki.supernico
Content
... ... @@ -19,7 +19,7 @@
19 19   #end
20 20   #set ($discard = $sameKeyObjects.add($object))
21 21   #end
22 - #foreach ($key in $properSortTool.sort($objectsMap.keySet()))
22 + #foreach ($key in $collectiontool.sort($objectsMap.keySet()))
23 23   #set ($sameKeyObjects = $objectsMap.get($key))
24 24   #foreach ($sameKeyObject in $sameKeyObjects)
25 25   #set ($discard = $outputObjects.add($sameKeyObject))
... ... @@ -26,20 +26,4 @@
26 26   #end
27 27   #end
28 28  #end
29 -
30 -#macro (defineSortTool $sortToolVariable)
31 - #set ($checkedExtension = "org.xwiki.commons:xwiki-commons-velocity")
32 - ## Because of an API collision, $collectionstool has been replaced by $collectiontool in XCOMMONS-1861
33 - #if ($services.extension.core.getCoreExtension($checkedExtension).id.version.compareTo("12.1-SNAPSHOT") >= 0)
34 - #setVariable ($sortToolVariable, $collectiontool)
35 - ## With the upgrade of Velocity $sorttool has been replaced by $collectionstool (XCOMMONS-1296)
36 - #elseif ($services.extension.core.getCoreExtension($checkedExtension).id.version.compareTo("12.0-SNAPSHOT") >= 0)
37 - #setVariable ($sortToolVariable, $collectionstool)
38 - ## Old API for sorting was $sorttool
39 - #else
40 - #setVariable ($sortToolVariable, $sorttool)
41 - #end
42 -#end
43 -
44 -#defineSortTool("$properSortTool")
45 45  {{/velocity}}