From 155c0fc878187db12fa895a6a3b333b1d168f8ee Mon Sep 17 00:00:00 2001 From: jensp Date: Wed, 16 Apr 2014 11:20:33 +0000 Subject: [PATCH] - Change to the PDL file of the About asset for publications - Minor enhancement for PublicationBundle, the method PublicationBundle#getPublication(String languge) now never returns null git-svn-id: https://svn.libreccm.org/ccm/trunk@2614 8810af33-2d31-482b-a856-94f89814c4df --- .../arsdigita/cms/contentassets/SciPublicationsAbout.pdl | 2 ++ .../com/arsdigita/cms/contenttypes/PublicationBundle.java | 8 +++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ccm-sci-assets-publicationsabout/pdl/com/arsdigita/cms/contentassets/SciPublicationsAbout.pdl b/ccm-sci-assets-publicationsabout/pdl/com/arsdigita/cms/contentassets/SciPublicationsAbout.pdl index bcab40ea0..f6bf64ef8 100644 --- a/ccm-sci-assets-publicationsabout/pdl/com/arsdigita/cms/contentassets/SciPublicationsAbout.pdl +++ b/ccm-sci-assets-publicationsabout/pdl/com/arsdigita/cms/contentassets/SciPublicationsAbout.pdl @@ -33,4 +33,6 @@ association { to ca_publications_about.discussing_publication_id, join ca_publications_about.discussed_publication_id to ct_publication_bundles.bundle_id; + + Integer[0..1] publicationsOrder = ca_publications_about.publications_order INTEGER; } \ No newline at end of file diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java index 41c514092..39ff778b1 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java @@ -375,6 +375,12 @@ public class PublicationBundle extends ContentBundle { } public Publication getPublication(final String language) { - return (Publication) getInstance(language); + //return (Publication) getInstance(language); + Publication result = (Publication) getInstance(language); + if (result == null) { + result = getPublication(); + } + + return result; } }