Änderungen von Dokument DiagramMacros

Zusammenfassung

• Seiteneigenschaften (1 geändert, 0 hinzugefügt, 0 gelöscht)

Details

Seiteneigenschaften

Inhalt

...	...	@@ -55,32 +55,18 @@
55	55	## Parameter for the drawio macro
56	56	#set($diagramName = $xcontext.macro.params.diagramName)
57	57	#end
58		- ## By default the diagramDocument should be the current doc
59		- #set ($diagramDocument = $doc)
60	60	## Get original document
61	61	#set ($originalDoc = $xcontext.macro.params.originalDocumentRef)
62	62	#if ("$!originalDoc" != '')
63		- #set ($diagramDocument = $xwiki.getDocument($originalDoc))
	61	+ #set ($doc = $xwiki.getDocument($originalDoc))
64	64	#end
65		- ## Used for gliffy macros that include a diagram from another page.
66		- #set ($pageID = $xcontext.macro.params.pageid)
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
75		- #set ($originalDoc = $diagramDocument)
76		- #end
77	77	## "Constants"
78	78	#set($previewImageName = "${diagramName}.png")
79		- #set($previewImage = $diagramDocument.getAttachment($previewImageName))
	65	+ #set($previewImage = $doc.getAttachment($previewImageName))
80	80	#if (!$previewImage)
81	81	## In some cases, the drawio file name is not the same as the PNG one.
82	82	#set($previewImageName = $xcontext.macro.params.tempPreview)
83		- #set($previewImage = $diagramDocument.getAttachment($previewImageName))
	69	+ #set($previewImage = $doc.getAttachment($previewImageName))
84	84	#end
85	85	## Variables
86	86	#set($displayDiagram = true)
...	...	@@ -87,8 +87,8 @@
87	87	#set($diagram = $NULL)
88	88	##
89	89	## Check if the diagram page exists
90		- #set($diagramDocumentReferenceSerialized = $services.model.serialize($diagramDocument.documentReference, 'local'))
91		- #set($diagrams = $services.query.xwql('from doc.object(Confluence.Macros.DiagramClass) as diagramObj where diagramObj.page = :page and diagramObj.diagramName = :diagramName').bindValue('page', $diagramDocumentReferenceSerialized).bindValue('diagramName', "$!diagramName").setLimit(1).execute())
	76	+ #set($docReferenceSerialized = $services.model.serialize($doc.documentReference, 'local'))
	77	+ #set($diagrams = $services.query.xwql('from doc.object(Confluence.Macros.DiagramClass) as diagramObj where diagramObj.page = :page and diagramObj.diagramName = :diagramName').bindValue('page', $docReferenceSerialized).bindValue('diagramName', "$!diagramName").setLimit(1).execute())
92	92	#if($diagrams.size() > 0)
93	93	#set($diagram = $diagrams.get(0))
94	94	#end
...	...	@@ -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
...	...	@@ -128,7 +128,7 @@
128	128	#end
129	129	##
130	130	## Display a button allowing the user to create an XWiki diagram
131		- #if ($services.security.authorization.hasAccess('edit', $diagramDocument.documentReference) && $xcontext.action != 'export')
	114	+ #if ($services.security.authorization.hasAccess('edit', $doc.documentReference) && $xcontext.action != 'export')
132	132	(% class="caption" %)(((
133	133	{{translation key='confluencediagram.create'/}}
134	134
...	...	@@ -135,7 +135,7 @@
135	135	{{html clean=false}}
136	136	<form action="" method="post">
137	137	<input name="action" value="createDiagram" type="hidden" />
138		- <input name="pageReferenceSerialized" class="create-diagram-page" value="$escapetool.xml($diagramDocumentReferenceSerialized)" type="hidden" />
	121	+ <input name="pageReferenceSerialized" class="create-diagram-page" value="$escapetool.xml($docReferenceSerialized)" type="hidden" />
139	139	<input name="diagramName" class="create-diagram-name" value="$escapetool.xml($diagramName)" type="hidden" />
140	140	<input name="diagramPNGName" class="create-diagram-png-name" value="$escapetool.xml($previewImageName)" type="hidden" />
141	141	<button type="submit" class="btn btn-primary create-diagram-btn">$escapetool.xml($services.localization.render('confluencediagram.create.confirm'))</button>
...	...	@@ -144,12 +144,6 @@
144	144	)))
145	145	)))
146	146	#end
147		- #elseif("$pageID" != "" && $displayWarning)
148		- ##If the display fails then show a warning.
149		- #set ($syntax = $services.rendering.resolveSyntax($xwiki.getCurrentContentSyntaxId()))
150		- #set ($message = $services.localization.render('confluencediagram.warning.notfound'))
151		-
152		- {{warning}}$message{{/warning}}
153	153	#end
154	154	)))
155	155	#end