Änderungen von Dokument Contributors

Zuletzt geändert von Daniel Herrmann am 2025/11/08 02:47

Von Version Icon 9.1 Icon
bearbeitet von Daniel Herrmann
am 2025/09/20 09:55
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.28.0]
Auf Version Icon 7.1 Icon
bearbeitet von Daniel Herrmann
am 2025/07/19 16:45
Änderungskommentar: Migrated property [contentOrder] from class [XWiki.WikiMacroClass]

Zusammenfassung

Details

Icon XWiki.WikiMacroClass[0]
Makro-Code
... ... @@ -1,3 +1,20 @@
1 +{{groovy output="false"}}
2 + xcontext.put("sortContributions", (contributions, key, reverse, limit) -> {
3 + def c = new ArrayList(contributions)
4 + Collections.sort(c, new Comparator<HashMap>() {
5 + @Override
6 + public int compare(HashMap<String, Object> v1, HashMap<String, Object> v2) {
7 + return reverse ? v2.get(key).compareTo(v1.get(key)) : v1.get(key).compareTo(v2.get(key))
8 + }
9 + })
10 + if (limit != null && limit > 0) {
11 + return c.take(limit)
12 + }
13 +
14 + return c
15 + })
16 +{{/groovy}}
17 +
1 1  {{velocity output="false"}}
2 2  #macro (datemax $d1 $d2)
3 3   #if ($d1.compareTo($d2))##
... ... @@ -108,11 +108,7 @@
108 108   #set($query = $services.query.xwql("select comment.author, max(comment.date), count(distinct comment) from Document doc, doc.object('XWiki.XWikiComments') comment where doc.fullName in (:d) group by comment.author"))
109 109   #addContributions($query, $pages)
110 110   #end
111 - #set ($limit = $numbertool.toNumber($limit).intValue())
112 - #if (!$limit)
113 - #set ($limit = -1)
114 - #end
115 - #set ($contributions = $services.contributors.sortContributors($contributors.values(), $order, $reverse, $numbertool.toNumber($limit).intValue()))
128 + #set($contributions = $xcontext.get('sortContributions').doCall($contributors.values(), $order, $reverse, $mathtool.toInteger($limit)))
116 116  
117 117  {{html clean=false}}
118 118   <div class="confluence-contributors">
... ... @@ -169,7 +169,7 @@
169 169  ## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
170 170  ## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
171 171  ## don't have view right on those pages.
172 -#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
185 +#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
173 173   #executeMacro
174 174  #else
175 175   {{missingLicenseMessage extensionName="proMacros.extension.name"/}}