diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeStep.java index 1b3bbfa78..42d52060d 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumeCollectedVolumeStep.java @@ -62,4 +62,5 @@ public class ArticleInCollectedVolumeCollectedVolumeStep itemModel); setDisplayComponent(sheet); } + } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertiesStep.java index 2c1f228b8..3d46b773e 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/ArticleInCollectedVolumePropertiesStep.java @@ -61,7 +61,7 @@ public class ArticleInCollectedVolumePropertiesStep "publications.ui.article_in_collected_volume.chapter"), ArticleInCollectedVolume.CHAPTER); - sheet.add(PublicationGlobalizationUtil.globalize( + sheet.add(PublicationGlobalizationUtil.globalize( "publications.ui.articleInCollectedVolume.reviewed"), ArticleInCollectedVolume.REVIEWED, new ReviewedFormatter()); @@ -102,13 +102,13 @@ public class ArticleInCollectedVolumePropertiesStep addStep(new ArticleInCollectedVolumeCollectedVolumeStep(itemModel, parent), - (String)PublicationGlobalizationUtil.globalize( + (String) PublicationGlobalizationUtil.globalize( "publications.ui.articleInCollectedVolume.collectedVolume"). localize()); } - private static class ReviewedFormatter + private static class ReviewedFormatter extends DomainService implements DomainObjectPropertySheet.AttributeFormatter { @@ -128,4 +128,9 @@ public class ArticleInCollectedVolumePropertiesStep } } } + + @Override + protected boolean isSeriesStepEnabled() { + return false; + } } diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java index f40f3e265..257c1cefd 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationPropertiesStep.java @@ -42,6 +42,7 @@ import java.text.DateFormat; /** * * @author Jens Pelzetter + * @version $Id$ */ public class PublicationPropertiesStep extends SimpleEditStep { @@ -85,12 +86,12 @@ public class PublicationPropertiesStep extends SimpleEditStep { if (Publication.getConfig().getEnableFirstPublishedProperty()) { sheet.add(PublicationGlobalizationUtil.globalize("publications.ui.publication.first_published"), - Publication.FIRST_PUBLISHED); + Publication.FIRST_PUBLISHED); } if (Publication.getConfig().getEnableLanguageProperty()) { sheet.add(PublicationGlobalizationUtil.globalize("publications.ui.publication.language"), - Publication.LANG); + Publication.LANG); } if (!ContentSection.getConfig().getHideLaunchDate()) { @@ -110,7 +111,6 @@ public class PublicationPropertiesStep extends SimpleEditStep { "cms.ui.unknown").localize(); } } - }); } @@ -147,8 +147,10 @@ public class PublicationPropertiesStep extends SimpleEditStep { AuthoringKitWizard parent) { addStep(new PublicationAuthorsPropertyStep(itemModel, parent), "publications.ui.publication.authors"); - addStep(new PublicationSeriesPropertyStep(itemModel, parent), - "publications.ui.publication.series"); + if (isSeriesStepEnabled()) { + addStep(new PublicationSeriesPropertyStep(itemModel, parent), + "publications.ui.publication.series"); + } } protected void addStep(SimpleEditStep step, String labelKey) { @@ -158,6 +160,10 @@ public class PublicationPropertiesStep extends SimpleEditStep { step); } + protected boolean isSeriesStepEnabled() { + return true; + } + protected static class PreFormattedTextFormatter extends DomainService implements DomainObjectPropertySheet.AttributeFormatter { @@ -175,6 +181,5 @@ public class PublicationPropertiesStep extends SimpleEditStep { return String.format("
%s", str); } } - } }