diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/CollectedVolume.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/CollectedVolume.pdl index 7ceadd0e1..d57f570f8 100644 --- a/ccm-sci-publications/pdl/com/arsdigita/content-types/CollectedVolume.pdl +++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/CollectedVolume.pdl @@ -29,7 +29,7 @@ object type CollectedVolume extends PublicationWithPublisher { //Moved to publication Boolean[0..1] reviewed = ct_collected_volume.reviewed BIT; } -object type CollectedVolumeBundle extends PublicationBundle { +object type CollectedVolumeBundle extends PublicationWithPublisherBundle { reference key (ct_collected_volume_bundles.bundle_id); } diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/PublicationWithPublisher.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/PublicationWithPublisher.pdl index 088abea6a..e7c9f00ec 100644 --- a/ccm-sci-publications/pdl/com/arsdigita/content-types/PublicationWithPublisher.pdl +++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/PublicationWithPublisher.pdl @@ -33,16 +33,20 @@ object type PublicationWithPublisher extends Publication { reference key (ct_publication_with_publisher.publication_with_publisher_id); } -association { - PublicationWithPublisher[0..n] publication = join ct_publisher.publisher_id - to ct_publication_with_publisher_publisher_map.publisher_id, - join ct_publication_with_publisher_publisher_map.publication_id - to ct_publication_with_publisher.publication_with_publisher_id; +object type PublicationWithPublisherBundle extends PublicationBundle { + reference key (ct_publication_with_publisher_bundles.bundle_id); +} - Publisher[0..n] publisher = join ct_publication_with_publisher.publication_with_publisher_id +association { + PublicationWithPublisherBundle[0..n] publication = join ct_publisher_bundles.bundle_id + to ct_publication_with_publisher_publisher_map.publisher_id, + join ct_publication_with_publisher_publisher_map.publication_id + to ct_publication_with_publisher_bundles.bundle_id; + + PublisherBundle[0..n] publisher = join ct_publication_with_publisher_bundles.bundle_id to ct_publication_with_publisher_publisher_map.publication_id, join ct_publication_with_publisher_publisher_map.publisher_id - to ct_publisher.publisher_id; + to ct_publisher_bundles.bundle_id; Integer[0..1] publisherOrder = ct_publication_with_publisher_publisher_map.publisher_order INTEGER; } diff --git a/ccm-sci-publications/pdl/com/arsdigita/content-types/Publisher.pdl b/ccm-sci-publications/pdl/com/arsdigita/content-types/Publisher.pdl index 22e331a67..effb60579 100644 --- a/ccm-sci-publications/pdl/com/arsdigita/content-types/Publisher.pdl +++ b/ccm-sci-publications/pdl/com/arsdigita/content-types/Publisher.pdl @@ -32,4 +32,8 @@ object type Publisher extends GenericOrganizationalUnit { reference key (ct_publisher.publisher_id); } +object type PublisherBundle extends GenericOrganizationalUnitBundle { + reference key (ct_publisher_bundles.bundle_id); +} + diff --git a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml index 93961ab68..9b526070f 100644 --- a/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml +++ b/ccm-sci-publications/src/WEB-INF/content-types/com/arsdigita/cms/contenttypes/Monograph.xml @@ -10,7 +10,7 @@ objectType="com.arsdigita.cms.contenttypes.Monograph" classname="com.arsdigita.cms.contenttypes.Monograph"> - + - + - +