Changes for page Legacy Confluence Bridge for PDF
Last modified by Frank Fock on 2025/01/26 23:11
From version 3.1
edited by Frank Fock
on 2025/01/26 23:11
on 2025/01/26 23:11
Change comment:
Install extension [com.xwiki.pro:xwiki-pro-macros/1.25.5]
To version 1.1
edited by Frank Fock
on 2024/02/07 18:16
on 2024/02/07 18:16
Change comment:
Install extension [com.xwiki.pro:xwiki-pro-macros/1.14.3]
Summary
-
Page properties (2 modified, 0 added, 0 removed)
-
Objects (1 modified, 0 added, 0 removed)
Details
- Page properties
-
- Title
-
... ... @@ -1,1 +1,1 @@ 1 - Legacy Confluence Bridge for PDF1 +PDF Macro - Content
-
... ... @@ -1,5 +3,3 @@ 1 -This is a legacy, unprefixed Confluence bridge for the ViewPDF macro. Please use view-file or pdfviewer instead. 2 - 3 3 {{code}} 4 4 {{viewpdf att--filename="PDFExample.pdf"/}} 5 5 {{/code}}
- XWiki.WikiMacroClass[0]
-
- Macro code
-
... ... @@ -1,26 +17,13 @@ 1 -{{velocity output="false"}} 2 -#macro (executeMacro) 3 - #set ($hasPDFViewer = $xwiki.exists('XWiki.PDFViewerMacro')) 4 - #set ($unescapedFilename = $xcontext.macro.params.get('att--filename')) 5 - #if (!$unescapedFilename) 6 - #set ($unescapedFilename = $xcontext.macro.params.get('name')) 7 - #end 8 - #set($escapedFilename = $services.rendering.escape($unescapedFilename, $xwiki.currentContentSyntaxId)) 9 - #if ($hasPDFViewer) 10 - {{pdfviewer file="$escapedFilename" /}} 11 - #else 12 - {{office reference="$escapedFilename" /}} 13 - #end 14 -#end 15 -{{/velocity}} 16 - 17 17 {{velocity}} 18 -## We need to check if there is a valid license because the macro is registered even if the user doesn't have view right 19 -## on the macro definition page. See XWIKI-14828: Rendering macros defined in wiki pages are available to users that 20 -## don't have view right on those pages. 21 -#if ($services.promacrolicensing.hasLicensureForEntity($xcontext.macro.doc.documentReference)) 22 - #executeMacro 2 +#set ($hasPDFViewer = $xwiki.exists('XWiki.PDFViewerMacro')) 3 +#set ($unescapedFilename = $xcontext.macro.params.get('att--filename')) 4 +#if (!$unescapedFilename) 5 + #set ($unescapedFilename = $xcontext.macro.params.get('name')) 6 +#end 7 +#set($escapedFilename = $services.rendering.escape($unescapedFilename, $xwiki.currentContentSyntaxId)) 8 +#if ($hasPDFViewer) 9 + {{pdfviewer file="$escapedFilename" /}} 23 23 #else 24 - {{ missingLicenseMessageextensionName="proMacros.extension.name"/}}11 + {{office reference="$escapedFilename" /}} 25 25 #end 26 26 {{/velocity}} - Default categories
-
... ... @@ -1,1 +1,0 @@ 1 -Deprecated - Macro description
-
... ... @@ -1,1 +1,1 @@ 1 - LegacyConfluencebridge for View PDF.1 +View Pdf documents. - Macro name
-
... ... @@ -1,1 +1,1 @@ 1 - Legacy Confluence bridge forView PDF1 +View Pdf