From 50fa51a9241c41e37f8e058b9be03ba871f4641f Mon Sep 17 00:00:00 2001 From: Jens Pelzetter Date: Sat, 27 Aug 2022 17:37:17 +0200 Subject: [PATCH] Bugfixes for authoring steps for Expertise --- .../scientificcms/publications/contenttypes/TalkItem.java | 5 +++++ .../ui/contenttypes/ExpertiseExtendedPropertiesStep.java | 2 +- .../ui/contenttypes/ExpertisePropertiesStep.java | 4 ++-- .../ui/contenttypes/GreyLiteraturePropertiesStep.java | 4 ++-- .../ui/contenttypes/InternetArticlePropertiesStep.java | 4 ++-- .../publications/ui/contenttypes/TalkPropertiesStep.java | 6 ++---- .../ui/contenttypes/WorkingPaperPropertiesStep.java | 6 ++---- .../contenttypes/ui/expertise/edit-expertise.xhtml | 4 ++-- 8 files changed, 18 insertions(+), 17 deletions(-) diff --git a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItem.java b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItem.java index afbe25b..39a1a42 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItem.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItem.java @@ -1,6 +1,7 @@ package org.scientificcms.publications.contenttypes; import org.hibernate.envers.Audited; +import org.librecms.contenttypes.ContentTypeDescription; import org.librecms.ui.contentsections.documents.MvcAuthoringKit; import org.scientificcms.publications.Talk; import org.scientificcms.publications.ui.contenttypes.PublicationAbstractStep; @@ -21,6 +22,10 @@ import static org.scientificcms.publications.SciPublicationsConstants.*; @Entity @Table(name = "TALK_ITEMS", schema = DB_SCHEMA) @Audited +@ContentTypeDescription( + labelBundle="org.scientificcms.publications.contenttypes.Talk", + descriptionBundle="org.scientificcms.publications.contenttypes.Talk" +) @MvcAuthoringKit( createStep = TalkItemCreateStep.class, authoringSteps = { diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ExpertiseExtendedPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ExpertiseExtendedPropertiesStep.java index 39b5348..9b636b1 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ExpertiseExtendedPropertiesStep.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ExpertiseExtendedPropertiesStep.java @@ -21,7 +21,7 @@ import javax.ws.rs.PathParam; * @author Jens Pelzetter */ @RequestScoped -@Path(MvcAuthoringSteps.PATH_PREFIX + "expertise-extendedproeprties") +@Path(MvcAuthoringSteps.PATH_PREFIX + "expertise-extendedproperties") @Controller @MvcAuthoringStepDef( bundle = SciPublicationsUiConstants.BUNDLE, diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ExpertisePropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ExpertisePropertiesStep.java index 2f1514e..f6dd5e4 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ExpertisePropertiesStep.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ExpertisePropertiesStep.java @@ -13,8 +13,8 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; import org.scientificcms.publications.Expertise; import org.scientificcms.publications.PublicationRepository; -import org.scientificcms.publications.SciPublicationsConstants; import org.scientificcms.publications.contenttypes.ExpertiseItem; +import org.scientificcms.publications.ui.SciPublicationsUiConstants; import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle; import java.util.Optional; @@ -42,7 +42,7 @@ import javax.ws.rs.PathParam; ) @Controller @MvcAuthoringStepDef( - bundle = SciPublicationsConstants.BUNDLE, + bundle = SciPublicationsUiConstants.BUNDLE, descriptionKey = "authoringsteps.basicproperties.description", labelKey = "authoringsteps.basicproperties.label", supportedDocumentType = ExpertiseItem.class diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/GreyLiteraturePropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/GreyLiteraturePropertiesStep.java index 66060a3..4e5d154 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/GreyLiteraturePropertiesStep.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/GreyLiteraturePropertiesStep.java @@ -10,8 +10,8 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; import org.scientificcms.publications.GreyLiterature; import org.scientificcms.publications.PublicationRepository; -import org.scientificcms.publications.SciPublicationsConstants; import org.scientificcms.publications.contenttypes.GreyLiteratureItem; +import org.scientificcms.publications.ui.SciPublicationsUiConstants; import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle; import javax.enterprise.context.RequestScoped; @@ -37,7 +37,7 @@ import javax.ws.rs.PathParam; ) @Controller @MvcAuthoringStepDef( - bundle = SciPublicationsConstants.BUNDLE, + bundle = SciPublicationsUiConstants.BUNDLE, descriptionKey = "authoringsteps.basicproperties.description", labelKey = "authoringsteps.basicproperties.label", supportedDocumentType = GreyLiteratureItem.class diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InternetArticlePropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InternetArticlePropertiesStep.java index 0d086d8..20039ca 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InternetArticlePropertiesStep.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InternetArticlePropertiesStep.java @@ -13,8 +13,8 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; import org.scientificcms.publications.InternetArticle; import org.scientificcms.publications.PublicationRepository; -import org.scientificcms.publications.SciPublicationsConstants; import org.scientificcms.publications.contenttypes.InternetArticleItem; +import org.scientificcms.publications.ui.SciPublicationsUiConstants; import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle; import java.util.Optional; @@ -42,7 +42,7 @@ import javax.ws.rs.PathParam; ) @Controller @MvcAuthoringStepDef( - bundle = SciPublicationsConstants.BUNDLE, + bundle = SciPublicationsUiConstants.BUNDLE, descriptionKey = "authoringsteps.basicproperties.description", labelKey = "authoringsteps.basicproperties.label", supportedDocumentType = InternetArticleItem.class diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/TalkPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/TalkPropertiesStep.java index 400192b..49bb620 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/TalkPropertiesStep.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/TalkPropertiesStep.java @@ -5,12 +5,11 @@ import org.librecms.ui.contentsections.ContentSectionNotFoundException; import org.librecms.ui.contentsections.documents.DocumentNotFoundException; import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; -import org.scientificcms.publications.SciPublicationsConstants; import org.scientificcms.publications.Talk; import org.scientificcms.publications.contenttypes.TalkItem; +import org.scientificcms.publications.ui.SciPublicationsUiConstants; import javax.enterprise.context.RequestScoped; -import javax.inject.Inject; import javax.mvc.Controller; import javax.transaction.Transactional; import javax.ws.rs.DefaultValue; @@ -20,7 +19,6 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import static org.scientificcms.publications.ui.contenttypes.ExpertisePropertiesStep.EDIT_STEP_URL_FRAGMENT; /** * @@ -33,7 +31,7 @@ import static org.scientificcms.publications.ui.contenttypes.ExpertiseProperties ) @Controller @MvcAuthoringStepDef( - bundle = SciPublicationsConstants.BUNDLE, + bundle = SciPublicationsUiConstants.BUNDLE, descriptionKey = "authoringsteps.basicproperties.description", labelKey = "authoringsteps.basicproperties.label", supportedDocumentType = TalkItem.class diff --git a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/WorkingPaperPropertiesStep.java b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/WorkingPaperPropertiesStep.java index 6777543..968d960 100644 --- a/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/WorkingPaperPropertiesStep.java +++ b/sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/WorkingPaperPropertiesStep.java @@ -5,10 +5,9 @@ import org.librecms.ui.contentsections.ContentSectionNotFoundException; import org.librecms.ui.contentsections.documents.DocumentNotFoundException; import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; -import org.scientificcms.publications.Expertise; -import org.scientificcms.publications.SciPublicationsConstants; import org.scientificcms.publications.WorkingPaper; import org.scientificcms.publications.contenttypes.WorkingPaperItem; +import org.scientificcms.publications.ui.SciPublicationsUiConstants; import javax.enterprise.context.RequestScoped; import javax.mvc.Controller; @@ -20,7 +19,6 @@ import javax.ws.rs.POST; import javax.ws.rs.Path; import javax.ws.rs.PathParam; -import static org.scientificcms.publications.ui.contenttypes.ExpertisePropertiesStep.EDIT_STEP_URL_FRAGMENT; /** * @@ -33,7 +31,7 @@ import static org.scientificcms.publications.ui.contenttypes.ExpertiseProperties ) @Controller @MvcAuthoringStepDef( - bundle = SciPublicationsConstants.BUNDLE, + bundle = SciPublicationsUiConstants.BUNDLE, descriptionKey = "authoringsteps.basicproperties.description", labelKey = "authoringsteps.basicproperties.label", supportedDocumentType = WorkingPaperItem.class diff --git a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-expertise.xhtml b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-expertise.xhtml index 05909c2..bcd5a7e 100644 --- a/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-expertise.xhtml +++ b/sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-expertise.xhtml @@ -94,7 +94,7 @@ confirmLabel="#{SciPublicationsUiMessageBundle['experise.basicproperties.orderer.confirm']}" dialogId="remove-orderer-dialog" dialogTitle="#{SciPublicationsUiMessageBundle['experise.basicproperties.orderer.title']}" - message="#{SciPublicationsUiMessageBundle.getMessage('experise.basicproperties.orderer.message', [CmsSelectedDocumentModel.name, SciCmsExpertisePropertiesStepModel.orderer])}" + message="#{SciPublicationsUiMessageBundle.getMessage('experise.basicproperties.orderer.message', [CmsSelectedDocumentModel.itemName, SciCmsExpertisePropertiesStepModel.orderer])}" /> @@ -134,7 +134,7 @@ confirmLabel="#{SciPublicationsUiMessageBundle['experise.basicproperties.organization.confirm']}" dialogId="remove-organization-dialog" dialogTitle="#{SciPublicationsUiMessageBundle['experise.basicproperties.organization.title']}" - message="#{SciPublicationsUiMessageBundle.getMessage('experise.basicproperties.organization.message', [CmsSelectedDocumentModel.name, SciCmsExpertisePropertiesStepModel.organization])}" + message="#{SciPublicationsUiMessageBundle.getMessage('experise.basicproperties.organization.message', [CmsSelectedDocumentModel.itemName, SciCmsExpertisePropertiesStepModel.organization])}" />