Changes for page SubmitIncidentMacro
Last modified by Ryan C on 2025/06/08 05:22
From 2.9 to 2.10
Show context
Hide context
Summary
Details
-
XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -1,5 +1,4 @@ 1 1 {{velocity}} 2 - 3 3 #set($headline = $wikimacro.parameters.headline) 4 4 #set($url = $wikimacro.parameters.url) 5 5 #set($desc = $wikimacro.parameters.description) ... ... @@ -15,28 +15,21 @@ 15 15 #end 16 16 #end 17 17 18 -## Construct the block 19 -#set($builder = "") 20 -#set($builder = "${builder}(% style=\"margin-bottom:20px; width:100%\" %)\n") 21 - 22 -## Add image line 17 +## Build incident block 18 +#set($incidentBlock = "(% class=\"incident-block\" %)\n") 23 23 #if ($resolvedImage && $resolvedImage != "") 24 - #set($ builder= "${builder}|[[image:${resolvedImage}||data-xwiki-image-style=\"thumbnail-clickable\" style=\"border:1px solid #ccc\"width=\"200\"]]| \n")20 + #set($incidentBlock = "${incidentBlock}|[[image:${resolvedImage}||width=\"200\" style=\"border:1px solid #ccc\"]]| \n") 25 25 #else 26 - #set($ builder= "${builder}|No image provided.| \n")22 + #set($incidentBlock = "${incidentBlock}|No image provided.| \n") 27 27 #end 24 +#set($incidentBlock = "${incidentBlock}\n=== [[$headline>>$url]] ===\n\n") 25 +#set($incidentBlock = "${incidentBlock}$desc\n[[Read More>>$url]]") 28 28 29 -## Add title and body 30 -#set($builder = "${builder}\n=== [[$headline>>$url]] ===\n\n") 31 -#set($builder = "${builder}$desc\n[[Read More>>$url]]") 32 - 33 -## Save to current doc 27 +## Append to current document 34 34 #set($doc = $xwiki.getDocument($doc.fullName)) 35 35 #set($content = $doc.getContent()) 36 -$doc.setContent("${content}\n\n${ builder}")30 +$doc.setContent("${content}\n\n${incidentBlock}") 37 37 $doc.save() 38 38 39 39 <div class="xwiki-messages xwiki-successmessage">Incident added to this page.</div> 40 - 41 41 {{/velocity}} 42 -
-
XWiki.WikiMacroParameterClass[1]
-
- Parameter description
-
... ... @@ -1,5 +3,1 @@ 1 - 2 - 3 3 The source URL of the incident (link) 4 - 5 -
