Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +2,4 @@
1		-
2	2	{{velocity}}
3		-
4	4	#set($localitySelectElement = {
5	5	"id" : "locality",
6	6	"type" : "select",
...	...	@@ -15,6 +15,7 @@
15	15	})
16	16
17	17	#macro(createSelectElement $elementDataObj)
	16	+{{html}}
18	18	#set($requiredAttributes = 'aria-required="false"')
19	19	#if($elementDataObj.required == true)
20	20	#set($requiredAttributes = 'aria-required="true" required="required"')
...	...	@@ -25,11 +25,11 @@
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('space').literal("${spaceRef}.").anyChars().query())
32		-## #set($query = $query.bindValue('spaceExclude').literal("${spaceExcludeRef}"))
	27	+ #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"))
	28	+ #set ($spaceLikeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
	29	+ #set ($spaceExcludeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
	30	+ #set($query = $query.bindValue('space', $spaceLikeRef))
	31	+ #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))
...	...	@@ -46,10 +46,9 @@
46	46	#if($elementDataObj.required == true)
47	47	</p>
48	48	#end
	48	+{{/html}}
49	49	#end
50	50
51	51	#createSelectElement($localitySelectElement)
52		-$localitySelectElement.id
53		-
54	54	{{/velocity}}
55	55