Changes for page Macros

Summary

• Page properties (1 modified, 0 added, 0 removed)

Details

Page properties

Content

...	...	@@ -51,7 +51,7 @@
51	51	#createTextElement($elementDataObj $elementType $requiredAttributes)
52	52	#elseif($elementType == "number")
53	53	#if(!$elementDataObj.data-decimals)#set($elementDataObj.data-decimals = 0)#end
54		- #if(!$elementDataObj.decimals-step)#set($elementDataObj.decimals-step = 0.5)#end
	54	+ #if(!$elementDataObj.decimals-step)#set($elementDataObj.decimals-step = 1)#end
55	55	#createNumberElement($elementDataObj $elementType $requiredAttributes)
56	56	#elseif($elementType == "email")
57	57	#elseif($elementType == "range")
...	...	@@ -93,15 +93,21 @@
93	93	#if($O_elementData.placeholder)
94	94	<option value="" disabled="" selected="" hidden="hidden">${O_elementData.placeholder}</option>
95	95	#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.space-reference.replaceAll('([%_!])', '!$1').concat('.%'))
98		- #set($spaceExcludeRef = $O_elementData.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>
	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
105	105	#end
106	106	</select>
107	107	#end
...	...	@@ -122,7 +122,7 @@
122	122	#end
123	123	#macro(createSubmit $O_submit)
124	124	<div class="clearfix">
125		- <p class="alert alert-warning alert-button-float-right">
	131	+ <p class="alert alert-danger alert-button-float-right">
126	126	<span class="alert-button pull-right">
127	127	#if ($xcontext.user != 'XWiki.XWikiGuest')
128	128	<input type="submit" class="btn btn-primary" id="${O_submit.id}" name="${O_submit.id}" value="${O_submit.button-text}" />