Zum Inhalt springen

Änderungen von Dokument DiagramMacros

Zuletzt geändert von Daniel Herrmann am 2026/02/04 20:25
Von 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]
Auf 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]

Zusammenfassung

Details

Icon Seiteneigenschaften
Inhalt
... ... @@ -65,13 +65,7 @@
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 ($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
68 + #set ($diagramDocument = $xwiki.getDocument($services.gliffyscript.getReferenceFromConfluenceID($pageID)))
75 75   #set ($originalDoc = $diagramDocument)
76 76   #end
77 77   ## "Constants"
... ... @@ -112,9 +112,6 @@
112 112   #displayConfluenceDiagramModal($id $diagram)
113 113   #end
114 114   #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)"/}}
118 118   #else
119 119   #set($displayDiagram = false)
120 120   #end
... ... @@ -144,7 +144,7 @@
144 144   )))
145 145   )))
146 146   #end
147 - #elseif("$pageID" != "" && $displayWarning)
138 + #else
148 148   ##If the display fails then show a warning.
149 149   #set ($syntax = $services.rendering.resolveSyntax($xwiki.getCurrentContentSyntaxId()))
150 150   #set ($message = $services.localization.render('confluencediagram.warning.notfound'))