Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,5 +1,6 @@
	1	+
1	1	{{velocity}}
2		-{{html}}
	3	+
3	3	#set($localitySelectElement = {
4	4	"id" : "locality",
5	5	"type" : "select",
...	...	@@ -24,12 +24,11 @@
24	24	<span class="input-wrap select-wrap">
25	25	<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">
26	26	<option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${elementDataObj.placeholder})</option>
27		-## #set ($spaceRef = $elementDataObj.space-reference)
	28	+ #set ($spaceRef = $elementDataObj.space-reference)
	29	+ #set ($spaceExcludeRef = "${spaceRef}.Code")
28	28	#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"))
29		- #set ($spaceLikeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
30		- #set ($spaceExcludeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
31		- #set($query = $query.bindValue('space', $spaceLikeRef))
32		- #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
	31	+ #set($query = $query.bindValue('space').literal("${spaceRef}.").anyChars().query())
	32	+ #set($query = $query.bindValue('spaceExclude').literal("${spaceExcludeRef}"))
33	33	#set($results = $query.addFilter('unique').execute())
34	34	#foreach ($item in $results)
35	35	#set ($document = $xwiki.getDocument($item))
...	...	@@ -49,6 +49,7 @@
49	49	#end
50	50
51	51	#createSelectElement($localitySelectElement)
52		-{{/html}}
	52	+$localitySelectElement.id
	53	+
53	53	{{/velocity}}
54	54