diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationInitializer.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationInitializer.java index 42ffd57c3..1206aaaba 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationInitializer.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationInitializer.java @@ -83,6 +83,7 @@ public class PublicationInitializer extends ContentTypeInitializer { logger.info(String.format("Attaching publications step to: '%s'", attachTo)); } + AuthoringKitWizard.registerAssetStep( attachTo, GenericOrganizationalUnitPublicationsStep.class, @@ -102,14 +103,25 @@ public class PublicationInitializer extends ContentTypeInitializer { 10); } - if (config.getAttachOrganizationPublicationsStep()) { + final String attachOrgaPubStepTo = config.getAttachOrganizationPublicationsStepTo(); + final String[] attachOrgaPubStepToCts = attachOrgaPubStepTo.split(";"); + if (logger.isInfoEnabled()) { + logger.info(String.format("Attaching organization publications step to: %s", + attachOrgaPubStepTo)); + } + for (String attachTo : attachOrgaPubStepToCts) { + if (logger.isInfoEnabled()) { + logger.info(String.format("Attaching publications step to: '%s'", + attachTo)); + } + AuthoringKitWizard.registerAssetStep( - GenericOrganizationalUnit.BASE_DATA_OBJECT_TYPE, + attachTo, OrganizationPublicationsStep.class, PublicationGlobalizationUtil.globalize("organization.ui.publications.title"), PublicationGlobalizationUtil.globalize("organization.ui.publications.description"), 11); - } + } } /** diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java index 3fc59fa28..831b0ed77 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig.java @@ -14,7 +14,7 @@ import com.arsdigita.util.parameter.StringParameter; public class PublicationsConfig extends AbstractConfig { private final Parameter attachOrgaUnitsStep; - private final Parameter attachOrganizationPublicationsStep; + private final Parameter attachOrganizationPublicationsStepTo; private final Parameter attachPersonPublicationsStep; private final Parameter attachPublicationsStepTo; private final Parameter attachPublisherPublicationsStep; @@ -39,11 +39,11 @@ public class PublicationsConfig extends AbstractConfig { Parameter.REQUIRED, Boolean.FALSE); - attachOrganizationPublicationsStep = - new BooleanParameter( - "com.arsdigita.cms.contenttypes.publications.attach_organization_publications_step", + attachOrganizationPublicationsStepTo = + new StringParameter( + "com.arsdigita.cms.contenttypes.publications.attach_organization_publications_step_to", Parameter.REQUIRED, - Boolean.TRUE); + ""); attachPersonPublicationsStep = new BooleanParameter( @@ -128,7 +128,7 @@ public class PublicationsConfig extends AbstractConfig { PublisherBundle.BASE_DATA_OBJECT_TYPE); register(attachOrgaUnitsStep); - register(attachOrganizationPublicationsStep); + register(attachOrganizationPublicationsStepTo); register(attachPersonPublicationsStep); register(attachPublicationsStepTo); register(attachPublisherPublicationsStep); @@ -153,8 +153,8 @@ public class PublicationsConfig extends AbstractConfig { return (Boolean) get(attachOrgaUnitsStep); } - public Boolean getAttachOrganizationPublicationsStep() { - return (Boolean) get(attachOrganizationPublicationsStep); + public String getAttachOrganizationPublicationsStepTo() { + return (String) get(attachOrganizationPublicationsStepTo); } public Boolean getAttachPersonPublicationsStep() { diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig_parameter.properties b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig_parameter.properties index 81e09b1e6..ecbd9ae0e 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig_parameter.properties +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/PublicationsConfig_parameter.properties @@ -3,10 +3,10 @@ com.arsdigita.cms.contenttypes.publications.attach_orgaunits_step.purpose = Enab com.arsdigita.cms.contenttypes.publications.attach_orgaunits_step.example = true com.arsdigita.cms.contenttypes.publications.attach_orgaunits_step.format = [Boolean] -com.arsdigita.cms.contenttypes.publications.attach_organization_publications_step.title = Enable OrganizationPublications step -com.arsdigita.cms.contenttypes.publications.attach_organization_publications_step.purpose = Attaches an authoring step to GenericOrganizationalUnit which displays all publications of the type UnPublished to which the organizational unit is assigned as publishing organization. -com.arsdigita.cms.contenttypes.publications.attach_organization_publications_step.example = true -com.arsdigita.cms.contenttypes.publications.attach_organization_publications_step.format = [Boolean] +com.arsdigita.cms.contenttypes.publications.attach_organization_publications_step_to.title = Enable OrganizationPublications step +com.arsdigita.cms.contenttypes.publications.attach_organization_publications_step_to.purpose = Attaches an authoring step to GenericOrganizationalUnit which displays all publications of the type UnPublished to which the organizational unit is assigned as publishing organization. +com.arsdigita.cms.contenttypes.publications.attach_organization_publications_step_to.example = com.arsdigita.cms.contenttypes.SimpleOrganization;com.arsdigita.cms.contenttypes.SciInstitute +com.arsdigita.cms.contenttypes.publications.attach_organization_publications_step_to.format = [String] com.arsdigita.cms.contenttypes.publications.attach_person_publications_step.title = Enable authoring which lists all publications of a person com.arsdigita.cms.contenttypes.publications.attach_person_publications_step.purpose = Attaches an authoring step to GenericPerson which displays all publications to which the person is assigned as author. diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties index fc1e47960..2f7f58fe2 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources.properties @@ -400,7 +400,7 @@ person.ui.publications.title=Publications person.ui.publications.columns.name=Title person.ui.publications.columns.year=Year person.ui.publications.columns.type=Type -publisher.ui.publications.title=Publications +publisher.ui.publications.title=Publications of the Publisher publisher.ui.publications.none=No publications publisher.ui.publications.name=Title publisher.ui.publications.columns.year=Jahr diff --git a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties index a5d9c4313..c41f72181 100644 --- a/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties +++ b/ccm-sci-publications/src/com/arsdigita/cms/contenttypes/ui/PublicationResources_de.properties @@ -399,7 +399,7 @@ person.ui.publications.title=Publikationen person.ui.publications.columns.name=Titel person.ui.publications.columns.year=Jahr person.ui.publications.columns.type=Typ -publisher.ui.publications.title=Publikationen +publisher.ui.publications.title=Titel des Verlages publisher.ui.publications.none=Keine Publikationen vorhanden publisher.ui.publications.name=Titel publisher.ui.publications.columns.year=Jahr