0 Votes

Changes for page SubmitIncidentMacro

Last modified by Ryan C on 2025/06/08 05:22

From version 2.3
edited by Ryan C
on 2025/06/08 03:32
Change comment: There is no comment for this version
To version 2.8
edited by Ryan C
on 2025/06/08 03:46
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -1,41 +1,33 @@
1 1  {{velocity}}
2 -#set($request = $request)
3 -#if($request.getParameter("submitIncident"))
4 - #set($headline = $request.getParameter("headline"))
5 - #set($url = $request.getParameter("url"))
6 - #set($desc = $request.getParameter("description"))
7 7  
8 -#set($block = '''
9 -(% style="margin-bottom:20px; width:100%" %)
10 -|[[image:PLACEHOLDER.jpg||alt="image" data-xwiki-image-style="thumbnail-clickable" style="border:1px solid #cccccc" width="200"]]|
3 +#set($headline = $wikimacro.parameters.headline)
4 +#set($url = $wikimacro.parameters.url)
5 +#set($desc = $wikimacro.parameters.description)
6 +#set($imageParam = $wikimacro.parameters.image)
11 11  
12 -=== [[${headline}>>${url}]] ===
13 -
14 -${desc}
15 -[[Read More>>${url}]]
16 -''')
17 -
18 -
19 - #set($doc = $xwiki.getDocument($doc.fullName))
20 - #set($content = $doc.getContent())
21 - $doc.setContent("${content}\n\n${block}")
22 - $doc.save()
23 -
24 - <div class=\"xwiki-messages xwiki-successmessage\">Incident added to page.</div>
8 +#set($resolvedImage = "")
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)
15 + #end
25 25  #end
26 26  
27 -<form method="post">
28 - <h3>Add Incident</h3>
29 - <label>Headline:</label><br/>
30 - <input type="text" name="headline" style="width:100%" /><br/><br/>
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]]")
31 31  
32 - <label>URL:</label><br/>
33 - <input type="text" name="url" style="width:100%" /><br/><br/>
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()
34 34  
35 - <label>Description:</label><br/>
36 - <textarea name="description" rows="4" style="width:100%"></textarea><br/><br/>
30 +<div class="xwiki-messages xwiki-successmessage">Incident added to this page.</div>
37 37  
38 - <input type="submit" name="submitIncident" value="Submit Incident" />
39 -</form>
40 40  {{/velocity}}
41 41  
XWiki.WikiMacroParameterClass[2]
Parameter type
... ... @@ -1,1 +1,1 @@
1 -org.xwiki.model.reference.AttachmentReference
1 +org.xwiki.rendering.macro.descriptor.parameter.DocumentResourceReference