Changes for page Macros

Summary

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

Details

Page properties

Content

...	...	@@ -1,6 +2,5 @@
1		-
2	2	{{velocity}}
3		-
	2	+{{html}}
4	4	#set($localitySelectElement = {
5	5	"id" : "locality",
6	6	"type" : "select",
...	...	@@ -26,11 +26,11 @@
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	28	## #set ($spaceRef = $elementDataObj.space-reference)
29		-## #set ($spaceExcludeRef = "${spaceRef}.Code")
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	31	#set ($spaceLikeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
	30	+ #set ($spaceExcludeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
32	32	#set($query = $query.bindValue('space', $spaceLikeRef))
33		- #set($query = $query.bindValue('spaceExclude', '${spaceLikeRef}.Code'))
	32	+ #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
34	34	#set($results = $query.addFilter('unique').execute())
35	35	#foreach ($item in $results)
36	36	#set ($document = $xwiki.getDocument($item))
...	...	@@ -50,7 +50,6 @@
50	50	#end
51	51
52	52	#createSelectElement($localitySelectElement)
53		-$localitySelectElement.id
54		-
	52	+{{/html}}
55	55	{{/velocity}}
56	56