LibreCCM
/
libreccm-legacy
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfix for RelatedLink. An NPE was thrown in RelatedLinkEditForm for related links without an target URI. 

git-svn-id: https://svn.libreccm.org/ccm/trunk@4329 8810af33-2d31-482b-a856-94f89814c4df
master
jensp 2016-09-29 11:32:44 +00:00
parent 6e6bed3468
commit 98ce77015b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-cms-assets-relatedlink/src/com/arsdigita/cms/contentassets/ui/RelatedLinkEditForm.java
View File

@ -88,7 +88,7 @@ public class RelatedLinkEditForm extends RelatedLinkPropertyForm {
if (getLinkSelectionModel().isSelected(ps)) { if (getLinkSelectionModel().isSelected(ps)) {
rl = (RelatedLink) getLinkSelectionModel().getSelectedLink(ps); rl = (RelatedLink) getLinkSelectionModel().getSelectedLink(ps);
if (!rl.getTargetURI().equals("caption")) { if (!("caption").equals(rl.getTargetURI())) {
//make this form visible because we are editing and its not a caption //make this form visible because we are editing and its not a caption
setVisible(ps, true); setVisible(ps, true);
} }

4
ccm-core/web/themes/foundry/foundry/lib/template-tags/content-items/scipublications.xsl
View File

@ -663,7 +663,7 @@
</xsl:template> </xsl:template>
<xsl:template match="content-item-layout//scipublications//collected-volume"> <xsl:template match="content-item-layout//scipublications//collected-volume">
<xsl:param name="$contentitem-tree" tunnel="yes" /> <xsl:param name="contentitem-tree" tunnel="yes" />
<xsl:if test="$contentitem-tree/collectedVolume"> <xsl:if test="$contentitem-tree/collectedVolume">
<xsl:apply-templates> <xsl:apply-templates>
@ -755,7 +755,7 @@
<xsl:template match="content-item-layout//scipublications//proceedings"> <xsl:template match="content-item-layout//scipublications//proceedings">
<xsl:param name="contentitem-tree" tunnel="yes"/> <xsl:param name="contentitem-tree" tunnel="yes"/>
<xsl:if test="$contentitem-tree/proceedings"> <xsl:if test="contentitem-tree/proceedings">
<xsl:apply-templates> <xsl:apply-templates>
<xsl:with-param name="contentitem-tree" <xsl:with-param name="contentitem-tree"
tunnel="yes" tunnel="yes"