Zum Inhalt springen

Änderungen von Dokument DiagramMacros

Zuletzt geändert von Daniel Herrmann am 2026/02/04 20:25
Von Version Icon 2.1 Icon
bearbeitet von Daniel Herrmann
am 2025/06/23 21:15
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-confluence-bridges-ui/1.27.0]
Auf Version Icon 4.1
bearbeitet von Daniel Herrmann
am 2026/02/04 20:25
Änderungskommentar: Install extension [com.xwiki.pro:xwiki-pro-macros-confluence-bridges-ui/1.29.1]

Zusammenfassung

Details

Icon Seiteneigenschaften
Inhalt
... ... @@ -65,7 +65,13 @@
65 65   ## Used for gliffy macros that include a diagram from another page.
66 66   #set ($pageID = $xcontext.macro.params.pageid)
67 67   #if ("$!pageID" != '' && "$!originalDoc" == '')
68 - #set ($diagramDocument = $xwiki.getDocument($services.gliffyscript.getReferenceFromConfluenceID($pageID)))
68 + #set ($reference = $services.gliffyscript.getReferenceFromConfluenceID($pageID))
69 + ## When the reference is null we should display a warning.
70 + #if ($reference)
71 + #set ($diagramDocument = $xwiki.getDocument($reference))
72 + #else
73 + #set ($displayWarning = true)
74 + #end
69 69   #set ($originalDoc = $diagramDocument)
70 70   #end
71 71   ## "Constants"
... ... @@ -106,6 +106,9 @@
106 106   #displayConfluenceDiagramModal($id $diagram)
107 107   #end
108 108   #end
115 + #elseif ($displayDiagram && "$!xcontext.macro.params.diagramUrl" != '')
116 + ## Use the externalDiagramUrl parameter from the diagram macro instead.
117 + {{diagram externalDiagramUrl="$services.rendering.escape($!xcontext.macro.params.diagramUrl, $xwiki.currentContentSyntaxId)"/}}
109 109   #else
110 110   #set($displayDiagram = false)
111 111   #end
... ... @@ -135,7 +135,7 @@
135 135   )))
136 136   )))
137 137   #end
138 - #else
147 + #elseif("$pageID" != "" && $displayWarning)
139 139   ##If the display fails then show a warning.
140 140   #set ($syntax = $services.rendering.resolveSyntax($xwiki.getCurrentContentSyntaxId()))
141 141   #set ($message = $services.localization.render('confluencediagram.warning.notfound'))