0 Votes

Changes for page SubmitIncidentMacro

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

From version 3.22
edited by Ryan C
on 2025/06/08 04:52
Change comment: There is no comment for this version
To version 3.14
edited by Ryan C
on 2025/06/08 04:37
Change comment: There is no comment for this version

Summary

Details

XWiki.WikiMacroClass[0]
Macro code
... ... @@ -2,38 +2,26 @@
2 2  #set($headline = "$!wikimacro.parameters.headline")
3 3  #set($url = "$!wikimacro.parameters.url")
4 4  #set($description = "$!wikimacro.parameters.description")
5 -#set($image = "$!wikimacro.parameters.image")
5 +#set($imageParam = "$!wikimacro.parameters.image")
6 6  
7 -## Left: Copyable wiki syntax (escaped manually)
8 -{{box title="Wiki Syntax (Copy and paste this)" cssClass="infobox" style="width:48%; float:left; margin-right:2%;"}}
9 -{{code language="xwiki/2.1"}}
10 -(% style="margin-bottom:20px; width:100%" %)
11 -|#if($image != "")[[image:$image||data-xwiki-image-style="thumbnail-clickable" style="border:1px solid #ccc" width="200"]]#{else}No image provided.#{end}|
12 -=== [[$headline>>$url]] ===
13 -$description
14 -[[Read More>>$url]]
15 -{{/code}}
16 -{{/box}}
7 +## Build incident block with careful escaping
8 +#set($block = '(% style="margin-bottom:20px; width:100%" %)')
9 +#set($block = "$block\n")
17 17  
18 -## Right: Live preview
19 -{{box title="Preview" cssClass="floatinginfobox" style="width:48%; float:left;"}}
20 -#if($image && $image != "")
21 - [[image:$image||width="200" style="border:1px solid #ccc;"]]
11 +#if($imageParam && $imageParam != "")
12 + #set($block = "$block|[[image:$imageParam||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\" width=\"200\"]]| \n")
22 22  #else
23 - (% style="width:200px; height:150px; background:#eee; text-align:center; border:1px solid #ccc;" %)
24 - No image
25 - (%)
14 + #set($block = "$block|No image provided.| \n")
26 26  #end
27 27  
28 -=== [[$headline>>$url]] ===
17 +#set($block = "$block\n=== [[$headline>>$url]] ===\n\n")
18 +#set($block = "$block$description\n\n[[Read More>>$url]]")
29 29  
30 -$description
20 +## Append to current document
21 +#set($doc = $xwiki.getDocument($doc.fullName))
22 +#set($content = $doc.getContent())
23 +$doc.setContent("$content\n\n$block")
24 +$doc.save()
31 31  
32 -[[Read More>>$url]]
33 -{{/box}}
34 -
35 -## Clear floats
36 -(% style="clear:both;" %)
37 -(%)
26 +<div class="alert alert-success">Incident added successfully to the page.</div>
38 38  {{/velocity}}
39 -