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

- 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
master
jensp 2014-04-16 11:20:33 +00:00
parent 15c83b31e9
commit 155c0fc878
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ccm-sci-assets-publicationsabout/pdl/com/arsdigita/cms/contentassets/SciPublicationsAbout.pdl
View File

@ -33,4 +33,6 @@ association {
to ca_publications_about.discussing_publication_id, to ca_publications_about.discussing_publication_id,
join ca_publications_about.discussed_publication_id join ca_publications_about.discussed_publication_id
to ct_publication_bundles.bundle_id; to ct_publication_bundles.bundle_id;
Integer[0..1] publicationsOrder = ca_publications_about.publications_order INTEGER;
} }

8
ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationBundle.java
View File

@ -375,6 +375,12 @@ public class PublicationBundle extends ContentBundle {
} }
public Publication getPublication(final String language) { 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;
} }
} }