Änderungen von Dokument DiagramMacros

Zusammenfassung

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

Details

Seiteneigenschaften

Inhalt

...	...	@@ -55,26 +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 ($diagramDocument = $xwiki.getDocument($services.gliffyscript.getReferenceFromConfluenceID($pageID)))
69		- #set ($originalDoc = $diagramDocument)
70		- #end
71	71	## "Constants"
72	72	#set($previewImageName = "${diagramName}.png")
73		- #set($previewImage = $diagramDocument.getAttachment($previewImageName))
	65	+ #set($previewImage = $doc.getAttachment($previewImageName))
74	74	#if (!$previewImage)
75	75	## In some cases, the drawio file name is not the same as the PNG one.
76	76	#set($previewImageName = $xcontext.macro.params.tempPreview)
77		- #set($previewImage = $diagramDocument.getAttachment($previewImageName))
	69	+ #set($previewImage = $doc.getAttachment($previewImageName))
78	78	#end
79	79	## Variables
80	80	#set($displayDiagram = true)
...	...	@@ -81,8 +81,8 @@
81	81	#set($diagram = $NULL)
82	82	##
83	83	## Check if the diagram page exists
84		- #set($diagramDocumentReferenceSerialized = $services.model.serialize($diagramDocument.documentReference, 'local'))
85		- #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())
86	86	#if($diagrams.size() > 0)
87	87	#set($diagram = $diagrams.get(0))
88	88	#end
...	...	@@ -119,7 +119,7 @@
119	119	#end
120	120	##
121	121	## Display a button allowing the user to create an XWiki diagram
122		- #if ($services.security.authorization.hasAccess('edit', $diagramDocument.documentReference) && $xcontext.action != 'export')
	114	+ #if ($services.security.authorization.hasAccess('edit', $doc.documentReference) && $xcontext.action != 'export')
123	123	(% class="caption" %)(((
124	124	{{translation key='confluencediagram.create'/}}
125	125
...	...	@@ -126,7 +126,7 @@
126	126	{{html clean=false}}
127	127	<form action="" method="post">
128	128	<input name="action" value="createDiagram" type="hidden" />
129		- <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" />
130	130	<input name="diagramName" class="create-diagram-name" value="$escapetool.xml($diagramName)" type="hidden" />
131	131	<input name="diagramPNGName" class="create-diagram-png-name" value="$escapetool.xml($previewImageName)" type="hidden" />
132	132	<button type="submit" class="btn btn-primary create-diagram-btn">$escapetool.xml($services.localization.render('confluencediagram.create.confirm'))</button>
...	...	@@ -135,12 +135,6 @@
135	135	)))
136	136	)))
137	137	#end
138		- #else
139		- ##If the display fails then show a warning.
140		- #set ($syntax = $services.rendering.resolveSyntax($xwiki.getCurrentContentSyntaxId()))
141		- #set ($message = $services.localization.render('confluencediagram.warning.notfound'))
142		-
143		- {{warning}}$message{{/warning}}
144	144	#end
145	145	)))
146	146	#end