Skip to content

Confluence macro doc - Show "xwikiPage" link if "equivXWikiFeature" is not set #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Josue-T merged 3 commits into from
May 6, 2026
+20 −11
Merged

Confluence macro doc - Show "xwikiPage" link if "equivXWikiFeature" is not set #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f289604
OP#115: Confluence macro doc - Show "xwikiPage" link if "equivXWikiFe…
Josue-T May 5, 2026
9a34f30
OP#115: Confluence macro doc - Show "xwikiPage" link if "equivXWikiFe…
Josue-T May 6, 2026
9347ead
OP#115: Confluence macro doc - Show "xwikiPage" link if "equivXWikiFe…
Josue-T May 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ...ikiorg-ui/src/main/resources/DocApp/Code/Confluence/ConfluenceMacroDocumentationClass.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@
<disabled>0</disabled>
<displayType>input</displayType>
<freeText/>
<hint>The documentation of a feature that should be used in XWiki for this feature regardless of the import.</hint>
<hint>The documentation of a feature that should be used in XWiki for this feature regardless of the import. This should be only set if the value differs from "Import target XWiki URL" or for bridges to specify what the bridge uses and what to use in XWiki natively.</hint>
<idField/>
<largeStorage>0</largeStorage>
<multiSelect>0</multiSelect>
Expand Down Expand Up @@ -150,7 +150,7 @@
<equivXWikiFeatureURL>
<customDisplay/>
<disabled>0</disabled>
<hint>The URL to the feature that should be used in XWiki for this feature regardless of the import.</hint>
<hint>The URL to the feature that should be used in XWiki for this feature regardless of the import. This should be only set if the value differs from "Import target XWiki URL" or for bridges to specify what the bridge uses and what to use in XWiki natively.</hint>
<name>equivXWikiFeatureURL</name>
<number>22</number>
<picker>0</picker>
Expand Down
27 changes: 18 additions & 9 deletions ...g-ui/src/main/resources/DocApp/Code/Confluence/ConfluenceMacroDocumentationClassSheet.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,14 +236,11 @@
#end
#set ($equivXWikiFeatureURL = $macroObj.getValue('equivXWikiFeatureURL'))
#set ($equivXWikiFeaturePageAnchor = $macroObj.getValue('equivXWikiFeaturePageAnchor'))
#if ("$!equivXWikiFeaturePageAnchor" != '')
#set ($equivXWikiFeaturePageAnchor = $equivXWikiFeaturePageAnchor + '||anchor="anchor"')
#end
#set ($equivXWikiFeaturePage = $macroObj.getValue('equivXWikiFeaturePage'))
#set ($correspondingXWikiFeature = $macroObj.getValue('correspondingXWikiFeature'))
#if ("$!equivXWikiFeatureURL" != '' || "$!correspondingXWikiFeature" != '')
#if ("$!equivXWikiFeatureURL" != '' || "$!correspondingXWikiFeature" != '' || "$!equivXWikiFeaturePage" != '' || ("$handling" != 'bridge' &amp;&amp; ("$!xwikiPage" != '' || "$!xwikiURL" != '')))

== What to use in XWiki
== What to use in XWiki ==

{{html clean="false"}}
&lt;div class="xform"&gt;&lt;span class=" xHint"&gt;
Expand All @@ -252,16 +249,28 @@
{{/html}}

$doc.display('correspondingXWikiFeature')
#if ("$!equivXWikiFeaturePage" != '')

## Logic
## if it's a migration of type bridge -&gt; take equivXWikiFeature if set, otherwise nothing.
## for others type: take equivXWikiFeature if set, otherwise use xwikiPage
#if ("$!equivXWikiFeaturePage" != '')
#if ("$!equivXWikiFeaturePageAnchor" == '')
See [[$equivXWikiFeaturePage]].
See [[$services.rendering.escape($equivXWikiFeaturePage, 'xwiki/2.1')]].
#else
See [[$equivXWikiFeaturePage||anchor="$equivXWikiFeaturePageAnchor"]].
See [[$services.rendering.escape($equivXWikiFeaturePage, 'xwiki/2.1')||anchor="$services.rendering.escape($equivXWikiFeaturePageAnchor, 'xwiki/2.1')"]].
#end
#elseif ("$!equivXWikiFeatureURL" != '' &amp;&amp; $equivXWikiFeatureURL != '?' &amp;&amp; $equivXWikiFeatureURL != '-')

See $doc.display('equivXWikiFeatureURL').
#elseif ("$handling" != 'bridge')
#if ("$!xwikiPage" != '')
#if ("$!xwikiPageAnchor" == '')
See [[$services.rendering.escape($xwikiPage, 'xwiki/2.1')]].
#else
See [[$services.rendering.escape($xwikiPage, 'xwiki/2.1')||anchor="$services.rendering.escape($xwikiPageAnchor, 'xwiki/2.1')"]].
#end
#elseif ("$!xwikiURL" != '' &amp;&amp; $xwikiURL != '?' &amp;&amp; $xwikiURL != '-')
See $doc.display('xwikiURL').
#end
#end
#end
#set ($handlingDetails = $macroObj.getValue('handlingDetails').trim())
Expand Down