Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.11
edited by Jip-jan Alunkel
on March 24, 15:18
Change comment: There is no comment for this version
To version 2.5
edited by Jip-jan Alunkel
on March 24, 15:07
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -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,12 +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 + <option value="" disabled="" selected="" hidden="hidden">$services.localization.render('${elementDataObj.placeholder}')</option>
28 28   #set ($spaceRef = $elementDataObj.space-reference)
29 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 - #set($query = $query.bindValue('space').literal("${spaceRef}.").anyChars().bindValue('spaceExclude').literal("${spaceExcludeRef}").query())
32 -## #set($query = $query.bindValue('spaceExclude').literal("${spaceExcludeRef}"))
32 + #set($query = $query.bindValue('space').literal("${spaceRef}.").anyChars())
33 + #set($query = $query.bindValue('spaceExclude').literal("${spaceExcludeRef}").query())
33 33   #set($results = $query.addFilter('unique').execute())
34 34   #foreach ($item in $results)
35 35   #set ($document = $xwiki.getDocument($item))
... ... @@ -49,7 +49,6 @@
49 49  #end
50 50  
51 51  #createSelectElement($localitySelectElement)
52 -$localitySelectElement.id
53 53  
54 54  {{/velocity}}
55 55