Changes for page Macros

Last modified by Jip-jan Alunkel on April 15, 18:09
From version 2.96
edited by Jip-jan Alunkel
on June 01, 19:37
Change comment: Renamed from xwiki:assets.formMaker.form-macros
To version 2.92
edited by Jip-jan Alunkel
on April 17, 22:25
Change comment: Renamed from xwiki:assets.formMaker.form-macros

Summary

Details

Page properties
Content
... ... @@ -93,21 +93,15 @@
93 93   #if($O_elementData.placeholder)
94 94   <option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
95 95   #end
96 - #if($O_elementData.select-space-reference)
97 - #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"))
98 - #set($spaceLikeRef = $O_elementData.select-space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
99 - #set($spaceExcludeRef = $O_elementData.select-space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
100 - #set($query = $query.bindValue('space', $spaceLikeRef))
101 - #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
102 - #set($results = $query.addFilter('unique').execute())
103 - #foreach ($item in $results)
104 - #set ($document = $xwiki.getDocument($item))
105 - <option value="$document.space">$document.getTitle()</option>
106 - #end
107 - #elseif($O_elementData.select-json)
108 - #foreach($item in $O_elementData.select-json.entrySet())
109 - <option value="$item.key">$item.value</option>
110 - #end
96 + #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"))
97 + #set($spaceLikeRef = $O_elementData.select-space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
98 + #set($spaceExcludeRef = $O_elementData.select-space-reference.replaceAll('([%_!])', '!$1').concat('.Code'))
99 + #set($query = $query.bindValue('space', $spaceLikeRef))
100 + #set($query = $query.bindValue('spaceExclude', $spaceExcludeRef))
101 + #set($results = $query.addFilter('unique').execute())
102 + #foreach ($item in $results)
103 + #set ($document = $xwiki.getDocument($item))
104 + <option value="$document.space">$document.getTitle()</option>
111 111   #end
112 112   </select>
113 113  #end
... ... @@ -128,7 +128,7 @@
128 128  #end
129 129  #macro(createSubmit $O_submit)
130 130   <div class="clearfix">
131 - <p class="alert alert-danger alert-button-float-right">
125 + <p class="alert alert-warning alert-button-float-right">
132 132   <span class="alert-button pull-right">
133 133  #if ($xcontext.user != 'XWiki.XWikiGuest')
134 134   <input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />