Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.14
edited by Jip-jan Alunkel
on March 24, 15:33
Change comment: There is no comment for this version
To version 2.17
edited by Jip-jan Alunkel
on March 24, 15:47
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -25,11 +25,12 @@
25 25   <span class="input-wrap select-wrap">
26 26   <select class="form-select form-control" aria-label="${elementDataObj.aria-label}" aria-describedby="${elementDataObj.id}_helpBlock" $requiredAttributes data-error-response-type="${elementDataObj.data-error-response-type}" data-set-space="${elementDataObj.data-set-space}" name="${elementDataObj.id}_select" id="${elementDataObj.id}_select">
27 27   <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${elementDataObj.placeholder})</option>
28 - #set ($spaceRef = $elementDataObj.space-reference)
29 - #set ($spaceExcludeRef = "${spaceRef}.Code")
30 - #set($query = $services.query.xwql("from doc.object(AppWithinMinutes.MetadataClass) met where doc.space like :space order by met.dataSpaceName asc"))
31 -## #set($query = $query.bindValue('spaceExclude').literal("${spaceExcludeRef}"))
32 - #set($query = $query.bindValue('space').literal("${spaceRef}.").anyChars().query())
28 +## #set ($spaceRef = $elementDataObj.space-reference)
29 + #set($query = $services.query.xwql("from doc.object(AppWithinMinutes.MetadataClass) met where doc.space like :space and doc.space <> :spaceExclude order by met.dataSpaceName asc"))
30 + #set ($spaceLikeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
31 + #set ($spaceExcludeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
32 + #set($query = $query.bindValue('space', $spaceLikeRef))
33 + #set($query = $query.bindValue('spaceExclude', '${spaceExcludeRef}'))
33 33   #set($results = $query.addFilter('unique').execute())
34 34   #foreach ($item in $results)
35 35   #set ($document = $xwiki.getDocument($item))