From 4e03986d4540f9d41490cd01417665141429ac0b Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Mon, 30 May 2022 20:22:48 +0200 Subject: [PATCH] Bugfixes for sci-publications, especially CollectedVolumeAsset --- .../assets/CollectedVolumeAsset.java | 9 +- .../publications/assets/ProceedingsAsset.java | 2 +- .../CollectedVolumeAssetCreateStep.java | 2 +- .../CollectedVolumeAssetEditStepModel.java | 4 +- .../ui/assets/SciPublicationsAssetSteps.java | 7 ++ .../ui/create-collectedvolume.xhtml | 8 +- .../ui/edit-collectedvolume.xhtml | 1 + ...V7_0_0_1__fix_publication_asset_tables.sql | 117 ++++++++++++++++++ ...V7_0_0_1__fix_publication_asset_tables.sql | 117 ++++++++++++++++++ .../ui/SciPublicationsBundle.properties | 4 +- .../ui/SciPublicationsBundle_de.properties | 4 +- 11 files changed, 264 insertions(+), 11 deletions(-) create mode 100644 sci-publications/src/main/resources/db/migrations/org/scientificcms/sci_publications/h2/V7_0_0_1__fix_publication_asset_tables.sql create mode 100644 sci-publications/src/main/resources/db/migrations/org/scientificcms/sci_publications/pgsql/V7_0_0_1__fix_publication_asset_tables.sql diff --git a/sci-publications/src/main/java/org/scientificcms/publications/assets/CollectedVolumeAsset.java b/sci-publications/src/main/java/org/scientificcms/publications/assets/CollectedVolumeAsset.java index 67568fb..8b975e0 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/assets/CollectedVolumeAsset.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/assets/CollectedVolumeAsset.java @@ -7,7 +7,10 @@ package org.scientificcms.publications.assets; import org.hibernate.envers.Audited; import org.librecms.contentsection.Asset; +import org.librecms.ui.contentsections.assets.MvcAssetEditKit; import org.scientificcms.publications.CollectedVolume; +import org.scientificcms.publications.ui.assets.CollectedVolumeAssetCreateStep; +import org.scientificcms.publications.ui.assets.CollectedVolumeAssetEditStep; import java.util.Objects; @@ -24,8 +27,12 @@ import static org.scientificcms.publications.SciPublicationsConstants.*; * @author Jens Pelzetter */ @Entity -@Table(name = "COLLECTED_VOLUMES", schema = DB_SCHEMA) +@Table(name = "COLLECTED_VOLUME_ASSETS", schema = DB_SCHEMA) @Audited +@MvcAssetEditKit( + createStep = CollectedVolumeAssetCreateStep.class, + editStep = CollectedVolumeAssetEditStep.class +) public class CollectedVolumeAsset extends Asset { private static final long serialVersionUID = 1L; diff --git a/sci-publications/src/main/java/org/scientificcms/publications/assets/ProceedingsAsset.java b/sci-publications/src/main/java/org/scientificcms/publications/assets/ProceedingsAsset.java index 19ae191..f65d19f 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/assets/ProceedingsAsset.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/assets/ProceedingsAsset.java @@ -24,7 +24,7 @@ import static org.scientificcms.publications.SciPublicationsConstants.*; * @author Jens Pelzetter */ @Entity -@Table(name = "PROCEEDINGS", schema = DB_SCHEMA) +@Table(name = "PROCEEDINGS_ASSETS", schema = DB_SCHEMA) @Audited public class ProceedingsAsset extends Asset { diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/CollectedVolumeAssetCreateStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/CollectedVolumeAssetCreateStep.java index abf6a43..b8ea0bb 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/CollectedVolumeAssetCreateStep.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/CollectedVolumeAssetCreateStep.java @@ -43,7 +43,7 @@ public class CollectedVolumeAssetCreateStep @Override public String showCreateStep() { - return "org/scientificcms/assets/collectedvolume/ui/create-collected-volume.xhtml"; + return "org/scientificcms/assets/collectedvolume/ui/create-collectedvolume.xhtml"; } @Override diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/CollectedVolumeAssetEditStepModel.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/CollectedVolumeAssetEditStepModel.java index a82009f..3bfe95e 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/CollectedVolumeAssetEditStepModel.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/CollectedVolumeAssetEditStepModel.java @@ -2,7 +2,7 @@ package org.scientificcms.publications.ui.assets; import org.librecms.assets.Person; import org.librecms.ui.contentsections.documents.CmsEditorLocaleVariantRow; -import org.scientificcms.publications.Publisher; +import org.scientificcms.publications.assets.PublisherAsset; import java.util.ArrayList; import java.util.Collections; @@ -146,7 +146,7 @@ public class CollectedVolumeAssetEditStepModel { } public String getPublisherType() { - return Publisher.class.getName(); + return PublisherAsset.class.getName(); } } diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/SciPublicationsAssetSteps.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/SciPublicationsAssetSteps.java index 5368dfd..8597e61 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/SciPublicationsAssetSteps.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/assets/SciPublicationsAssetSteps.java @@ -16,10 +16,17 @@ public class SciPublicationsAssetSteps implements MvcAssetEditSteps { @Override public Set> getClasses() { return Set.of( + CollectedVolumeAssetEditStep.class, JournalAssetEditStep.class, PublisherAssetEditStep.class, SeriesAssetEditStep.class ); } + @Override + public Set> getResourceClasses() { + return Set.of( + CollectedVolumeAssetAuthors.class + ); + } } diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/assets/collectedvolume/ui/create-collectedvolume.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/assets/collectedvolume/ui/create-collectedvolume.xhtml index 04d7bea..44beda0 100644 --- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/assets/collectedvolume/ui/create-collectedvolume.xhtml +++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/assets/collectedvolume/ui/create-collectedvolume.xhtml @@ -26,7 +26,7 @@ name="name" pattern="^([a-zA-Z0-9_-]*)$" required="true" - value="#{SciCmsJournalAssetCreateStep.name}" + value="#{SciCmsCollectedVolumeAssetCreateStep.name}" /> #{SciPublicationsUiMessageBundle['collectedvolume.editstep.properties.edit']} +