Modifications pour le document Macros

Résumé

• Propriétés de la Page (1 modifications, 0 ajouts, 0 suppressions)

Détails

Propriétés de la Page

Contenu

...	...	@@ -1,7 +1,7 @@
1	1
2	2	{{velocity}}
3	3
4		-#set($localitySelectElement = {
	4	+#set($localitySelectElement = '{
5	5	"id" : "locality",
6	6	"type" : "select",
7	7	"required" : true,
...	...	@@ -12,8 +12,9 @@
12	12	"placeholder" : "cases.word.locality_select.placeholder",
13	13	"space-reference" : "cases",
14	14	"help-block" : "In which physiological or psychological epicenter can the main complaint be placed? Select the best fitting option from this list."
15		-})
	15	+}')
16	16
	17	+
17	17	#macro(createSelectElement $elementDataObj)
18	18	#set($requiredAttributes = 'aria-required="false"')
19	19	#if($elementDataObj.required == true)
...	...	@@ -24,13 +24,12 @@
24	24	$elementDataObj.label
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		- <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${elementDataObj.placeholder})</option>
28		-## #set ($spaceRef = $elementDataObj.space-reference)
	28	+ <option value="" disabled="" selected="" hidden="hidden">$services.localization.render('${elementDataObj.placeholder}')</option>
	29	+ #set ($spaceRef = $elementDataObj.space-reference)
	30	+ #set ($spaceExcludeRef = "${spaceRef}.Code")
29	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))
	32	+ #set($query = $query.bindValue('space').literal("${spaceRef}.").anyChars())
	33	+ #set($query = $query.bindValue('spaceExclude').literal("${spaceExcludeRef}").query())
34	34	#set($results = $query.addFilter('unique').execute())
35	35	#foreach ($item in $results)
36	36	#set ($document = $xwiki.getDocument($item))
...	...	@@ -50,8 +50,6 @@
50	50	#end
51	51
52	52	#createSelectElement($localitySelectElement)
53		-$spaceExcludeRef
54	54
55		-
56	56	{{/velocity}}
57	57