Modifications pour le document Content Report Table Macro
Modifié par superadmin le 21/07/2025 - 08:59
Résumé
-
Objets (3 modifications, 0 ajouts, 0 suppressions)
Détails
- XWiki.WikiMacroClass[0]
-
- Code de la macro
-
... ... @@ -1,8 +1,9 @@ 1 1 {{velocity output="false"}} 2 2 #macro (executeMacro) 3 3 ## Used parameters : 4 - #set($labels = $wikimacro.parameters.get('labels')) 5 - #set($spaces = $wikimacro.parameters.get('spaces')) 4 + ## TODO When https://jira.xwiki.org/browse/XWIKI-18965 is fixed move back to the newer $wikimacro API 5 + #set($labels = $xcontext.macro.params.labels) 6 + #set($spaces = $xcontext.macro.params.spaces) 6 6 #set($maxResults = $wikimacro.parameters.get('maxResults')) 7 7 #if("$!maxResults" == '') 8 8 #set($maxResults = 20) ... ... @@ -22,12 +22,13 @@ 22 22 }) 23 23 #if("$!spaces" != '') 24 24 #set ($statement = $statement + ' and (') 25 - #foreach($space in $spaces.split('(?<!\\\\), ')) 26 + #foreach($space in $spaces.split('(?<!\\\\), ?')) 26 26 #if($foreach.index > 0) 27 27 #set($statement = $statement + ' or ') 28 28 #end 29 - #set($statement = $statement + "doc.space like :space$foreach.index") 30 - #set($discard = $params.put("space$foreach.index", $space.replaceAll('([%_!])', '!$1').concat('%'))) 30 + #set($spaceVar = "space$foreach.index") 31 + #set($statement = $statement + "doc.space = :$spaceVar or doc.space like concat(:$spaceVar, '.%') or doc.space like concat('%.', :$spaceVar) or doc.space like concat('%.', :$spaceVar, '.%')") 32 + #set($discard = $params.put($spaceVar, $space)) 31 31 #end 32 32 #set($statement = $statement + ')') 33 33 #end - Default categories
-
... ... @@ -1,0 +1,1 @@ 1 +Content
- XWiki.WikiMacroParameterClass[0]
-
- Type du paramètre
-
... ... @@ -1,0 +1,1 @@ 1 +com.xwiki.pickers.TagsReference
- XWiki.WikiMacroParameterClass[1]
-
- Type du paramètre
-
... ... @@ -1,0 +1,1 @@ 1 +com.xwiki.pickers.SuggestSpacesReference