Änderungen von Dokument Excerpt Macro

Zusammenfassung

• Seiteneigenschaften (1 geändert, 0 hinzugefügt, 0 gelöscht)
• Objekte (1 geändert, 0 hinzugefügt, 0 gelöscht)
  • XWiki.WikiMacroClass[0]

Details

Seiteneigenschaften

Inhalt

...	...	@@ -1,11 +1,11 @@
1	1	= Description =
2	2
3		-The Excerpt macro is a bridge between Confluence and XWiki. It allows the user to mark part of the page's content for use by other macros, for exemple {excerpt-include}}.
	3	+The Excerpt macro is a bridge between Confluence and XWiki. It allows the user to mark part of the page's content for use by other macros, for instance {{code language="none"}}{{excerpt-include}}{{/code}}.
4	4
5	5	= Parameters =
6	6
7	7	|=Parameter|=Description|=Default
8		-|**atlassian-macro-output-type**|The ouput type. It can be either BLOCK or INLINE.|INLINE
	8	+|**atlassian-macro-output-type**|The ouput type. It can be either BLOCK or INLINE. Here for historical reasons and won't be shown in the macro editor.|INLINE
9	9	|**hidden**|If true, the content of the macro will be hidden.|false
10	10	|**name**|The name of the excerpt, for named includes.|false
11	11	|**allowUnprivilegedInclude**|Allow this excerpt to be seen even for people who don't have view rights on this page when included|false

XWiki.WikiMacroClass[0]

Makro-Code

...	...	@@ -1,4 +1,4 @@
1		-{{velocity output="false"}}
	1	+{{velocity}}
2	2	#macro (executeMacro)
3	3	#set($hidden = $wikimacro.parameters.get('hidden'))
4	4	#if("$!hidden" != 'true')
...	...	@@ -11,14 +11,11 @@
11	11	#else{{wikimacrocontent /}}#end##
12	12	#end##
13	13	#end
14		-{{/velocity}}
15		-
16		-{{velocity}}
17	17	## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right
18	18	## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that
19	19	## don't have view right on those pages.
20	20	#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference))
21		- #executeMacro##
	18	+#executeMacro##
22	22	#else
23	23	{{missingLicenseMessage extensionName="proMacros.extension.name"/}}
24	24	#end

Makrobeschreibung

...	...	@@ -1,1 +1,1 @@
1		-Bridge for the Confluence Excerpt macro. It marks part of the page's content for use by other macros.
	1	+Excerpt macro. It marks part of the page's content for use by other macros. It is compatible with the Confluence Excerpt macro.