Changes for page Macros

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

Summary

Details

Page properties
Content
... ... @@ -1,4 +1,6 @@
1 +
1 1  {{velocity}}
3 +
2 2  #set($localitySelectElement = {
3 3   "id" : "locality",
4 4   "type" : "select",
... ... @@ -13,7 +13,6 @@
13 13  })
14 14  
15 15  #macro(createSelectElement $elementDataObj)
16 -{{html}}
17 17   #set($requiredAttributes = 'aria-required="false"')
18 18   #if($elementDataObj.required == true)
19 19   #set($requiredAttributes = 'aria-required="true" required="required"')
... ... @@ -24,11 +24,12 @@
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 26   <option value="" disabled="" selected="" hidden="hidden">$services.localization.render(${elementDataObj.placeholder})</option>
28 +## #set ($spaceRef = $elementDataObj.space-reference)
27 27   #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"))
28 28   #set ($spaceLikeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
29 29   #set ($spaceExcludeRef = $elementDataObj.space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
30 30   #set($query = $query.bindValue('space', $spaceLikeRef))
31 - #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
33 + #set($query = $query.bindValue('spaceExclude', '${spaceExcludeRef}'))
32 32   #set($results = $query.addFilter('unique').execute())
33 33   #foreach ($item in $results)
34 34   #set ($document = $xwiki.getDocument($item))
... ... @@ -45,9 +45,10 @@
45 45   #if($elementDataObj.required == true)
46 46   </p>
47 47   #end
48 -{{/html}}
49 49  #end
50 50  
51 51  #createSelectElement($localitySelectElement)
53 +$localitySelectElement.id
54 +
52 52  {{/velocity}}
53 53