Changes for page Macros

Modificado por Jip-jan Alunkel em abril 15, 18:09
From version 2.21
edited by Jip-jan Alunkel
on março 24, 15:51
Change comment: There is no comment for this version
To version 2.6
edited by Jip-jan Alunkel
on março 24, 15:09
Change comment: There is no comment for this version

Summary

Details

Page properties
Content
... ... @@ -1,6 +1,7 @@
1 +
1 1  {{velocity}}
2 -{{html}}
3 -#set($localitySelectElement = {
3 +
4 +#set($localitySelectElement = '{
4 4   "id" : "locality",
5 5   "type" : "select",
6 6   "required" : true,
... ... @@ -11,7 +11,7 @@
11 11   "placeholder" : "cases.word.locality_select.placeholder",
12 12   "space-reference" : "cases",
13 13   "help-block" : "In which physiological or psychological epicenter can the main complaint be placed? Select the best fitting option from this list."
14 -})
15 +}')
15 15  
16 16  #macro(createSelectElement $elementDataObj)
17 17   #set($requiredAttributes = 'aria-required="false"')
... ... @@ -23,13 +23,12 @@
23 23   $elementDataObj.label
24 24   <span class="input-wrap select-wrap">
25 25   <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">
26 - <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${elementDataObj.placeholder})</option>
27 -## #set ($spaceRef = $elementDataObj.space-reference)
27 + <option value="" disabled="" selected="" hidden="hidden">$services.localization.render('${elementDataObj.placeholder}')</option>
28 + #set ($spaceRef = $elementDataObj.space-reference)
29 + #set ($spaceExcludeRef = "${spaceRef}.Code")
28 28   #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"))
29 - #set ($spaceLikeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
30 - #set ($spaceExcludeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
31 - #set($query = $query.bindValue('space', $spaceLikeRef))
32 - #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
31 + #set($query = $query.bindValue('space').literal("${spaceRef}.").anyChars())
32 + #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,6 +49,7 @@
49 49  #end
50 50  
51 51  #createSelectElement($localitySelectElement)
52 -{{/html}}
52 +$localitySelectElement.id
53 +
53 53  {{/velocity}}
54 54