Skip to content
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

EZP-30513: eZXMLText Migration: ignore nested embeds in the link #98

Closed
wants to merge 3 commits into from
Closed

EZP-30513: eZXMLText Migration: ignore nested embeds in the link #98

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
baf5f56
EZP-30513: Inore nested embed/embed-inline inside link
SerheyDolgushev May 7, 2019
0881992
EZP-30513: tests
SerheyDolgushev May 7, 2019
6c09e0b
EZP-30513: fixes for tests
SerheyDolgushev Aug 9, 2019
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
3 changes: 3 additions & 0 deletions lib/FieldType/XmlText/Input/Resources/stylesheets/eZXml2Docbook_core.xsl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -617,6 +617,9 @@
</xsl:element>
</xsl:template>

<xsl:template match="link/embed|link/embed-inline">
</xsl:template>

<xsl:template name="addEmbedLinkAttributes">
<xsl:variable name="fragment">
<xsl:if test="@ezlegacytmp-embed-link-anchor_name != ''">
Expand Down
3 changes: 3 additions & 0 deletions tests/lib/FieldType/Converter/Xslt/_fixtures/docbook/014-link.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@
<link xlink:href="ezcontent://333" xlink:show="none" xml:id="id5" xlink:title="Content title" ezxhtml:class="linkClass5">Content name</link>
</para>
<para><anchor xml:id="anchor"/>Some anchored content.</para>
<para>
<link xlink:href="ezcontent://333" xlink:show="none" xml:id="id7">link with nested embed</link>
</para>
</section>
3 changes: 3 additions & 0 deletions tests/lib/FieldType/Converter/Xslt/_fixtures/ezxml/014-link.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,7 @@
<link object_id="333" xhtml:id="id5" xhtml:title="Content title" class="linkClass5">Content name</link>
</paragraph>
<paragraph><anchor name="anchor"/>Some anchored content.</paragraph>
<paragraph>
<link object_id="333" xhtml:id="id7">link with nested embed<embed-inline view="embed-inline" size="original" object_id="444"/></link>
</paragraph>
</section>