Changes for page Macros

Summary

• Page properties (1 modified, 0 added, 0 removed)

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")
	28	+## #set ($spaceRef = $elementDataObj.space-reference)
30	30	#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"))
31		- #set($query = $query.bindValue('space').literal("${spaceRef}.").anyChars().bindValue('spaceExclude').literal("${spaceExcludeRef}").query())
32		-## #set($query = $query.bindValue('spaceExclude').literal("${spaceExcludeRef}"))
	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))
...	...	@@ -49,7 +49,8 @@
49	49	#end
50	50
51	51	#createSelectElement($localitySelectElement)
52		-$localitySelectElement.id
	53	+$spaceExcludeRef
53	53
	55	+
54	54	{{/velocity}}
55	55