Changes for page Macros

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

Summary

Details

Page properties
Content
... ... @@ -1,7 +2,5 @@
1 -
2 2  {{velocity}}
3 -
4 -#set($localitySelectElement = '{
2 +#set($localitySelectElement = {
5 5   "id" : "locality",
6 6   "type" : "select",
7 7   "required" : true,
... ... @@ -12,10 +12,10 @@
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 -}')
13 +})
16 16  
17 -
18 18  #macro(createSelectElement $elementDataObj)
16 +{{html}}
19 19   #set($requiredAttributes = 'aria-required="false"')
20 20   #if($elementDataObj.required == true)
21 21   #set($requiredAttributes = 'aria-required="true" required="required"')
... ... @@ -25,12 +25,12 @@
25 25   $elementDataObj.label
26 26   <span class="input-wrap select-wrap">
27 27   <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">
28 - <option value="" disabled="" selected="" hidden="hidden">$services.localization.render('${elementDataObj.placeholder}')</option>
29 - #set ($spaceRef = $elementDataObj.space-reference)
30 - #set ($spaceExcludeRef = "${spaceRef}.Code")
26 + <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${elementDataObj.placeholder})</option>
31 31   #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"))
32 - #set($query = $query.bindValue('space').literal("${spaceRef}.").anyChars())
33 - #set($query = $query.bindValue('spaceExclude').literal("${spaceExcludeRef}").query())
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))
34 34   #set($results = $query.addFilter('unique').execute())
35 35   #foreach ($item in $results)
36 36   #set ($document = $xwiki.getDocument($item))
... ... @@ -47,9 +47,9 @@
47 47   #if($elementDataObj.required == true)
48 48   </p>
49 49   #end
48 +{{/html}}
50 50  #end
51 51  
52 52  #createSelectElement($localitySelectElement)
53 -
54 54  {{/velocity}}
55 55