Changes for page SubmitIncidentMacro

Summary

• Objects (1 modified, 0 added, 0 removed)
  • XWiki.WikiMacroClass[0]

Details

XWiki.WikiMacroClass[0]

Macro code

...	...	@@ -1,29 +1,33 @@
1	1	{{velocity}}
	2	+
2	2	#set($headline = $wikimacro.parameters.headline)
3	3	#set($url = $wikimacro.parameters.url)
4	4	#set($desc = $wikimacro.parameters.description)
5		-#set($imageRef = $wikimacro.parameters.image)
	6	+#set($imageParam = $wikimacro.parameters.image)
6	6
7	7	#set($resolvedImage = "")
8		-#if ($imageRef)
9		- #set($resolved = $services.rendering.resolveDocumentResourceReference($imageRef, 'attachment'))
10		- #if ($resolved)
11		- #set($resolvedImage = $resolved.resourceReference.reference)
	9	+#if ($imageParam && $services.rendering)
	10	+ #set($ref = $services.rendering.resolveDocumentResourceReference($imageParam, 'attachment'))
	11	+ #if ($ref)
	12	+ #set($resolvedImage = $ref.resourceReference.reference)
	13	+ #else
	14	+ #set($resolvedImage = $imageParam)
12	12	#end
13	13	#end
14	14
15		-#set($block = "
16		-(% style=\"margin-bottom:20px; width:100%\" %)
17		-|[[image:$resolvedImage||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]|
	18	+## Build incident block line by line
	19	+#set($block = "(% style=\"margin-bottom:20px; width:100%\" %)\n")
	20	+#set($block = "${block}|[[image:${resolvedImage}||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]| \n")
	21	+#set($block = "${block}\n=== [[$headline>>$url]] ===\n\n")
	22	+#set($block = "${block}$desc\n[[Read More>>$url]]")
18	18
19		-=== [[$headline>>$url]] ===
	24	+## Append to current page
	25	+#set($doc = $xwiki.getDocument($doc.fullName))
	26	+#set($content = $doc.getContent())
	27	+$doc.setContent("${content}\n\n${block}")
	28	+$doc.save()
20	20
21		-$desc
22		-[[Read More>>$url]]
23		-")
	30	+<div class="xwiki-messages xwiki-successmessage">Incident added to this page.</div>
24	24
25		-$doc.setContent("${doc.getContent()}\n\n${block}")
26		-$doc.save()
27		-<div class=\"xwiki-messages xwiki-successmessage\">Incident added.</div>
28	28	{{/velocity}}
29	29