Changes for page Highlighted Collabs

Summary

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

Details

Page properties

Content

...	...	@@ -7,19 +7,6 @@
7	7	#set($featuredFilter = [1, 0])
8	8	#end
9	9	#set($collabs = $query.bindValue('featured', $featuredFilter).execute())
10		-#macro(collablist $collabs)
11		-[
12		-#foreach($collab of $collabs)
13		- #set($highlight = $xwiki.getDocument($collab))
14		- #set($collabId = $highlight.getValue('collab_id'))
15		- #set($collabURL = '/bin/view/Collabs/'+$collabId)
16		- #set($hasPicture = $highlight.getAttachment('highlight.png').isImage())
17		- {
18		- "title": "$highlight.getTitle()"
19		- },
20		-#end
21		-]
22		-#end
23	23	{{/velocity}}
24	24
25	25	{{velocity wiki="false"}}
...	...	@@ -27,18 +27,24 @@
27	27	#if("$!request.outputSyntax" != '')
28	28	$response.setContentType('application/json')
29	29	#end
30		-##set($MyJsonData = {'greeting': 'Hello', 'location': 'World'})
31		-##$jsontool.serialize($collabs)
32	32
33		-#collablist($collab)
	18	+#foreach($collab of $collabs)
	19	+ #set($highlight = $xwiki.getDocument($collab))
	20	+ #set($collabId = $highlight.getValue('collab_id'))
	21	+ #set($collabURL = '/bin/view/Collabs/'+$collabId)
	22	+ #set($hasPicture = $highlight.getAttachment('highlight.png').isImage())
	23	+ #if($hasPicture)
	24	+ #set($picture = $highlight.getAttachmentURL('highlight.png'))
	25	+ #else
	26	+ #set($picture = "")
	27	+ #end
34	34
35		-## In order to ensure the generated JSON is valid it is recommanded to
36		-## build the JSON in memory (using Velocity/Java maps, arrays and basic types)
37		-## and then serialize it with $jsontool.serialize method.
38		-## Usage (from Marius: http://xwiki.markmail.org/message/wsvaj4leg5atufwd):
39		-## #set($array = [1, 2, 3])
40		-## $jsontool.serialize($array)
41		-## #set($map = {'enabled': true, 'color': 'yellow', 'count': 13})
42		-## $jsontool.serialize($map)
	29	+ {
	30	+ "title": "$highlight.getTitle()",
	31	+ "content": "$highlight.getContent()",
	32	+ "image": "$picture",
	33	+ }#if( $foreach.hasNext ), #end
	34	+#end
	35	+])
43	43
44	44	{{/velocity}}