From 2f4e7b1a50db072e634fdac629b8a20b75394dc2 Mon Sep 17 00:00:00 2001 From: jensp Date: Tue, 1 Nov 2011 12:48:24 +0000 Subject: [PATCH] =?UTF-8?q?Alle=20Aufrufe=20von=20ContentBundle#hasInstanc?= =?UTF-8?q?e(String)=20gepr=C3=BCft=20und=20ggf.=20auf=20ContentBundle#has?= =?UTF-8?q?Instance(String,=20boolean)=20ge=C3=A4ndert.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@1214 8810af33-2d31-482b-a856-94f89814c4df --- .../cms/contenttypes/PublicPersonalProfile.xml | 12 ++++++++---- .../cms/contenttypes/GenericOrganizationalUnit.java | 4 ++-- .../ui/GenericContactAttachAddressPropertyForm.java | 2 +- .../ui/GenericContactAttachPersonPropertyForm.java | 2 +- .../ui/GenericOrganizationalUnitContactAddForm.java | 2 +- .../ui/GenericOrganizationalUnitPersonAddForm.java | 2 +- .../contenttypes/ui/GenericPersonAliasSetForm.java | 2 +- .../contenttypes/ui/GenericPersonContactAddForm.java | 2 +- .../ArticleInCollectedVolumeCollectedVolumeForm.java | 2 +- .../contenttypes/ui/ArticleInJournalJournalForm.java | 2 +- .../ui/CollectedVolumeArticleAddForm.java | 2 +- .../cms/contenttypes/ui/ExpertiseOrdererForm.java | 2 +- .../contenttypes/ui/ExpertiseOrganizationForm.java | 2 +- .../ui/InProceedingsProceedingsForm.java | 2 +- .../ui/InternetArticleOrganizationForm.java | 2 +- .../cms/contenttypes/ui/JournalArticleAddForm.java | 2 +- .../contenttypes/ui/ProceedingsOrganizerForm.java | 2 +- .../contenttypes/ui/ProceedingsPapersAddForm.java | 2 +- .../contenttypes/ui/PublicationAuthorAddForm.java | 2 +- .../contenttypes/ui/PublicationSeriesAddForm.java | 2 +- .../ui/PublicationWithPublisherSetPublisherForm.java | 2 +- .../cms/contenttypes/ui/SeriesEditshipAddForm.java | 2 +- .../cms/contenttypes/ui/SeriesVolumeAddForm.java | 2 +- .../contenttypes/ui/UnPublishedOrganizationForm.java | 2 +- 24 files changed, 32 insertions(+), 28 deletions(-) diff --git a/ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml b/ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml index b5c6b5bc6..ccbca41d5 100644 --- a/ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml +++ b/ccm-cms-publicpersonalprofile/src/WEB-INF/traversal-adapters/com/arsdigita/cms/contenttypes/PublicPersonalProfile.xml @@ -15,18 +15,22 @@ - - + - + - + + + diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnit.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnit.java index 27ebf3f4d..61cb64871 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnit.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/GenericOrganizationalUnit.java @@ -131,9 +131,9 @@ public class GenericOrganizationalUnit extends ContentPage { GenericPerson personToLink = person; final ContentBundle bundle = person.getContentBundle(); - if ((bundle != null) && (bundle.hasInstance(this.getLanguage()))) { + if ((bundle != null) && (bundle.hasInstance(this.getLanguage(), true))) { personToLink = - (GenericPerson) bundle.getInstance(this.getLanguage()); + (GenericPerson) bundle.getInstance(this.getLanguage(), true); } Assert.exists(personToLink, GenericPerson.class); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachAddressPropertyForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachAddressPropertyForm.java index 3051c6f80..ece6ce4cf 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachAddressPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachAddressPropertyForm.java @@ -162,7 +162,7 @@ public class GenericContactAttachAddressPropertyForm extends BasicPageForm GenericAddress address = (GenericAddress) data.get(ITEM_SEARCH); - if (!(address.getContentBundle().hasInstance(contact.getLanguage()))) { + if (!(address.getContentBundle().hasInstance(contact.getLanguage(), true))) { data.addError( ContenttypesGlobalizationUtil.globalize( "cms.contenttypes.ui.contact.select_address.no_suitable_language_variant")); } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachPersonPropertyForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachPersonPropertyForm.java index 9bc5ee4a8..0403b661d 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachPersonPropertyForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericContactAttachPersonPropertyForm.java @@ -192,7 +192,7 @@ public class GenericContactAttachPersonPropertyForm extends BasicPageForm getSelectedObject(state); GenericPerson person = (GenericPerson) data.get(ITEM_SEARCH); - if (!(person.getContentBundle().hasInstance(contact.getLanguage()))) { + if (!(person.getContentBundle().hasInstance(contact.getLanguage(), true))) { data.addError("cms.contenttypes.ui.contact.select_person.no_suitable_language_variant"); } diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactAddForm.java index 8044cb000..aab4fb11c 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitContactAddForm.java @@ -202,7 +202,7 @@ public class GenericOrganizationalUnitContactAddForm GenericContact contact = (GenericContact) data.get(ITEM_SEARCH); - if (!(contact.getContentBundle().hasInstance(orgaunit.getLanguage()))) { + if (!(contact.getContentBundle().hasInstance(orgaunit.getLanguage(), true))) { data.addError( ContenttypesGlobalizationUtil.globalize( "cms.contenttypes.ui.genericorgaunit.select_contact.no_suitable_language_variant")); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java index 2b7dbf69a..f94b4d366 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericOrganizationalUnitPersonAddForm.java @@ -245,7 +245,7 @@ public class GenericOrganizationalUnitPersonAddForm GenericPerson person = (GenericPerson) data.get(ITEM_SEARCH); - if (!(person.getContentBundle().hasInstance(orga.getLanguage()))) { + if (!(person.getContentBundle().hasInstance(orga.getLanguage(), true))) { data.addError( ContenttypesGlobalizationUtil.globalize( "cms.contenttypes.ui.genericorgaunit.person.no_suitable_language_variant")); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonAliasSetForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonAliasSetForm.java index 1577ba7f3..2a2ae7cf8 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonAliasSetForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonAliasSetForm.java @@ -137,7 +137,7 @@ public class GenericPersonAliasSetForm } else if (person.equals(data.get(ITEM_SEARCH))) { data.addError(ContenttypesGlobalizationUtil.globalize( "cms.contenttypes.person.alias.select.same_as_person")); - } else if (!alias.getContentBundle().hasInstance(person.getLanguage())) { + } else if (!alias.getContentBundle().hasInstance(person.getLanguage(), true)) { data.addError( ContenttypesGlobalizationUtil.globalize( "cms.contenttypes.person.alias.select.no_suitable_language_variant")); diff --git a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java index 463358513..e2f574901 100644 --- a/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java +++ b/ccm-cms/src/com/arsdigita/cms/contenttypes/ui/GenericPersonContactAddForm.java @@ -156,7 +156,7 @@ public class GenericPersonContactAddForm extends BasicItemForm { GenericContact contact = (GenericContact) data.get(ITEM_SEARCH); - if (!(contact.getContentBundle().hasInstance(person.getLanguage()))) { + if (!(contact.getContentBundle().hasInstance(person.getLanguage(), true))) { data.addError( ContenttypesGlobalizationUtil.globalize( "cms.contenttypes.ui.person.select_contact.no_suitable_language_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeForm.java index 173c7e7e7..a0197df71 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeForm.java @@ -107,7 +107,7 @@ public class ArticleInCollectedVolumeCollectedVolumeForm CollectedVolume collectedVolume = (CollectedVolume) data.get(ITEM_SEARCH); - if (!(collectedVolume.getContentBundle().hasInstance(article.getLanguage()))) { + if (!(collectedVolume.getContentBundle().hasInstance(article.getLanguage(), true))) { data.addError( PublicationGlobalizationUtil.globalize( "publications.ui.articleInCollectedVolume.selectCollectedVolume.no_suitable_language_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java index 2729183d8..7455c4814 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInJournalJournalForm.java @@ -100,7 +100,7 @@ public class ArticleInJournalJournalForm state); Journal journal = (Journal) data.get(ITEM_SEARCH); - if (!(journal.getContentBundle().hasInstance(article.getLanguage()))) { + if (!(journal.getContentBundle().hasInstance(article.getLanguage(), true))) { data.addError(PublicationGlobalizationUtil.globalize( "publications.ui.articleInJournal.selectJournal.no_suitable_language_variant")); return; diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticleAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticleAddForm.java index 293f222b9..0b1c080fb 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticleAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/CollectedVolumeArticleAddForm.java @@ -112,7 +112,7 @@ public class CollectedVolumeArticleAddForm CollectedVolume collectedVolume = (CollectedVolume) getItemSelectionModel().getSelectedObject(state); ArticleInCollectedVolume article = (ArticleInCollectedVolume) data.get(ITEM_SEARCH); - if (!(article.getContentBundle().hasInstance(collectedVolume.getLanguage()))) { + if (!(article.getContentBundle().hasInstance(collectedVolume.getLanguage(), true))) { data.addError(PublicationGlobalizationUtil.globalize( "publications.ui.collected_volume.articles.select_article.no_suitable_language_variant")); return; diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java index cd6cc98e2..4c8223541 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrdererForm.java @@ -80,7 +80,7 @@ public class ExpertiseOrdererForm Expertise expertise = (Expertise) getItemSelectionModel().getSelectedObject(state); GenericOrganizationalUnit orderer = (GenericOrganizationalUnit) data.get(ITEM_SEARCH); - if (!(orderer.getContentBundle().hasInstance(expertise.getLanguage()))) { + if (!(orderer.getContentBundle().hasInstance(expertise.getLanguage(), true))) { data.addError(PublicationGlobalizationUtil.globalize( "publications.ui.expertise.orderer.no_suitable_langauge_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java index 940250b56..d29b1ec22 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ExpertiseOrganizationForm.java @@ -80,7 +80,7 @@ public class ExpertiseOrganizationForm Expertise expertise = (Expertise) getItemSelectionModel().getSelectedObject(state); GenericOrganizationalUnit orga = (GenericOrganizationalUnit) data.get(ITEM_SEARCH); - if (!(orga.getContentBundle().hasInstance(expertise.getLanguage()))) { + if (!(orga.getContentBundle().hasInstance(expertise.getLanguage(), true))) { data.addError(PublicationGlobalizationUtil.globalize( "publications.ui.expertise.organization.no_suitable_language_variant")); return; diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsForm.java index 10a2fbbfb..219315311 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InProceedingsProceedingsForm.java @@ -103,7 +103,7 @@ public class InProceedingsProceedingsForm getSelectedObject(state); Proceedings proceedings = (Proceedings) data.get(ITEM_SEARCH); if (!(proceedings.getContentBundle().hasInstance(inProceedings. - getLanguage()))) { + getLanguage(), true))) { data.addError( PublicationGlobalizationUtil.globalize( "publications.ui.inProceedings.selectProceedings.no_suitable_language_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java index 259d6a4f5..e64c05858 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/InternetArticleOrganizationForm.java @@ -82,7 +82,7 @@ public class InternetArticleOrganizationForm getSelectedObject(state); GenericOrganizationalUnit orga = (GenericOrganizationalUnit) data.get( ITEM_SEARCH); - if (!(orga.getContentBundle().hasInstance(article.getLanguage()))) { + if (!(orga.getContentBundle().hasInstance(article.getLanguage(), true))) { data.addError( PublicationGlobalizationUtil.globalize( "publications.ui.internetarticle.select_organization.no_suitable_language_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticleAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticleAddForm.java index b1ecc96ef..eaabae132 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticleAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/JournalArticleAddForm.java @@ -109,7 +109,7 @@ public class JournalArticleAddForm Journal journal = (Journal) getItemSelectionModel().getSelectedObject( state); ArticleInJournal article = (ArticleInJournal) data.get(ITEM_SEARCH); - if (!(article.getContentBundle().hasInstance(journal.getLanguage()))) { + if (!(article.getContentBundle().hasInstance(journal.getLanguage(), true))) { data.addError( PublicationGlobalizationUtil.globalize( "publications.ui.journal.articles.select_article.no_suitable_language_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java index 0dd89736e..fe477babc 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsOrganizerForm.java @@ -83,7 +83,7 @@ public class ProceedingsOrganizerForm getSelectedObject(state); GenericOrganizationalUnit organizer = (GenericOrganizationalUnit) data. get(ITEM_SEARCH); - if (!(organizer.getContentBundle().hasInstance(proceedings.getLanguage()))) { + if (!(organizer.getContentBundle().hasInstance(proceedings.getLanguage(), true))) { data.addError(PublicationGlobalizationUtil.globalize( "publications.ui.proceedings.organizer.no_suitable_language_variant")); return; diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersAddForm.java index ef4016ff2..674e09509 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ProceedingsPapersAddForm.java @@ -105,7 +105,7 @@ public class ProceedingsPapersAddForm Proceedings proceedings = (Proceedings) getItemSelectionModel(). getSelectedObject(state); InProceedings paper = (InProceedings) data.get(ITEM_SEARCH); - if (!(paper.getContentBundle().hasInstance(proceedings.getLanguage()))) { + if (!(paper.getContentBundle().hasInstance(proceedings.getLanguage(), true))) { data.addError( PublicationGlobalizationUtil.globalize( "publications.ui.proceedings.select_paper.no_suitable_language_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java index f1b0c680c..4f75ffb54 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationAuthorAddForm.java @@ -211,7 +211,7 @@ public class PublicationAuthorAddForm getSelectedAuthor(); editing = true; } - if (!(author.getContentBundle().hasInstance(publication.getLanguage()))) { + if (!(author.getContentBundle().hasInstance(publication.getLanguage(), true))) { data.addError( PublicationGlobalizationUtil.globalize( "publications.ui.authors.selectAuthor.no_suitable_language_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationSeriesAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationSeriesAddForm.java index 785e5246e..90f22babd 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationSeriesAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationSeriesAddForm.java @@ -108,7 +108,7 @@ public class PublicationSeriesAddForm Publication publication = (Publication) getItemSelectionModel(). getSelectedObject(state); Series series = (Series) data.get(ITEM_SEARCH); - if (!(series.getContentBundle().hasInstance(publication.getLanguage()))) { + if (!(series.getContentBundle().hasInstance(publication.getLanguage(), true))) { data.addError( PublicationGlobalizationUtil.globalize( "publications.ui.series.select_series.no_suitable_language_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherSetPublisherForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherSetPublisherForm.java index 46bc1e747..db3399e4c 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherSetPublisherForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationWithPublisherSetPublisherForm.java @@ -85,7 +85,7 @@ public class PublicationWithPublisherSetPublisherForm (PublicationWithPublisher) getItemSelectionModel(). getSelectedObject(state); Publisher publisher = (Publisher) data.get(ITEM_SEARCH); - if (!(publisher.getContentBundle().hasInstance(publication.getLanguage()))) { + if (!(publisher.getContentBundle().hasInstance(publication.getLanguage(), true))) { data.addError( PublicationGlobalizationUtil.globalize( "publications.ui.with_publisher.publisher.no_suitable_language_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java index 1d5ab37b8..409815e4d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesEditshipAddForm.java @@ -196,7 +196,7 @@ public class SeriesEditshipAddForm Series series = (Series) getItemSelectionModel().getSelectedObject(state); GenericPerson editor = (GenericPerson) data.get(ITEM_SEARCH); - if (!(editor.getContentBundle().hasInstance(series.getLanguage()))) { + if (!(editor.getContentBundle().hasInstance(series.getLanguage(), true))) { data.addError(PublicationGlobalizationUtil.globalize( "publications.ui.series.editship.no_suitable_language_variant")); return; diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesVolumeAddForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesVolumeAddForm.java index ce553c3e3..4d146bead 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesVolumeAddForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/SeriesVolumeAddForm.java @@ -119,7 +119,7 @@ public class SeriesVolumeAddForm extends BasicItemForm { Series series = (Series) getItemSelectionModel(). getSelectedObject(state); Publication volume = (Publication) data.get(ITEM_SEARCH); - if (!(volume.getContentBundle().hasInstance(series.getLanguage()))) { + if (!(volume.getContentBundle().hasInstance(series.getLanguage(), true))) { data.addError( PublicationGlobalizationUtil.globalize( "publications.ui.series.volume_of_series.no_suitable_language_variant")); diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedOrganizationForm.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedOrganizationForm.java index 8c2e3c659..1931e7939 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedOrganizationForm.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/UnPublishedOrganizationForm.java @@ -82,7 +82,7 @@ public class UnPublishedOrganizationForm getSelectedObject(state); GenericOrganizationalUnit orga = (GenericOrganizationalUnit) data.get( ITEM_SEARCH); - if (!(orga.getContentBundle().hasInstance(unPublished.getLanguage()))) { + if (!(orga.getContentBundle().hasInstance(unPublished.getLanguage(), true))) { data.addError(PublicationGlobalizationUtil.globalize( "publications.ui.unpublished.organization.no_suitable_language_variant")); return;