Zum Inhalt springen

Änderungen von Dokument Content Report Table Macro

Zuletzt geändert von xwikiadmin am 2025/05/21 10:03
Von Version 3.1
bearbeitet von xwikiadmin
am 2023/04/25 11:27
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros/1.7.1]
Auf Version 7.1
bearbeitet von xwikiadmin
am 2025/05/21 10:03
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-ui/1.26.19]

Zusammenfassung

Details

XWiki.WikiMacroClass[0]
Makro-Code
... ... @@ -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
... ... @@ -35,7 +35,7 @@
35 35   #set($query = $services.query.hql($statement))
36 36   #set($discard = $query.bindValues($params))
37 37   #if("$!maxResults" != '')
38 - #set($discard = $query.setLimit($mathtool.toNumber($maxResults)).addFilter('currentlanguage'))
40 + #set($discard = $query.setLimit($numbertool.toNumber($maxResults)).addFilter('currentlanguage'))
39 39   #end
40 40   #set($results = $query.execute())
41 41   ## Table display
... ... @@ -46,17 +46,13 @@
46 46  #end
47 47  {{/velocity}}
48 48  
49 -{{include reference="Licenses.Code.VelocityMacros"/}}
50 -
51 51  {{velocity}}
52 52  ## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
53 53  ## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
54 54  ## don't have view right on those pages.
55 -#if ($services.licensing.licensor.hasLicensureForEntity($xcontext.macro.doc.documentReference))
55 +#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
56 56   #executeMacro
57 57  #else
58 - {{error}}
59 - #getMissingLicenseMessage('proMacros.extension.name')
60 - {{/error}}
58 + {{missingLicenseMessage extensionName="proMacros.extension.name"/}}
61 61  #end
62 62  {{/velocity}}
Standardkategorie
... ... @@ -1,1 +1,0 @@
1 -content
Makrobeschreibung
... ... @@ -1,1 +1,0 @@
1 -Provides a content report in table format, based on labels.
Default categories
... ... @@ -1,0 +1,1 @@
1 +Content
XWiki.WikiMacroParameterClass[0]
Parameter-Beschreibung
... ... @@ -1,1 +1,0 @@
1 -Label(s) to report on
Parameter-Typ
... ... @@ -1,0 +1,1 @@
1 +com.xwiki.pickers.TagsReference
XWiki.WikiMacroParameterClass[1]
Parameter-Beschreibung
... ... @@ -1,1 +1,0 @@
1 -Space(s) to report on
Parameter-Typ
... ... @@ -1,0 +1,1 @@
1 +com.xwiki.pickers.SuggestSpacesReference
XWiki.WikiMacroParameterClass[4]
Parameter-Beschreibung
... ... @@ -1,1 +1,0 @@
1 -Maximum Number of Pages