LibreCCM
/
scientificcms
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bugfixes for authoring steps for Expertise

pull/1/head
Jens Pelzetter 2022-08-27 17:37:17 +02:00
parent 6d8554500c
commit 50fa51a924
8 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sci-publications/src/main/java/org/scientificcms/publications/contenttypes/TalkItem.java
View File

@ -1,6 +1,7 @@
package org.scientificcms.publications.contenttypes; package org.scientificcms.publications.contenttypes;
import org.hibernate.envers.Audited; import org.hibernate.envers.Audited;
import org.librecms.contenttypes.ContentTypeDescription;
import org.librecms.ui.contentsections.documents.MvcAuthoringKit; import org.librecms.ui.contentsections.documents.MvcAuthoringKit;
import org.scientificcms.publications.Talk; import org.scientificcms.publications.Talk;
import org.scientificcms.publications.ui.contenttypes.PublicationAbstractStep; import org.scientificcms.publications.ui.contenttypes.PublicationAbstractStep;
@ -21,6 +22,10 @@ import static org.scientificcms.publications.SciPublicationsConstants.*;
@Entity @Entity
@Table(name = "TALK_ITEMS", schema = DB_SCHEMA) @Table(name = "TALK_ITEMS", schema = DB_SCHEMA)
@Audited @Audited
@ContentTypeDescription(
labelBundle="org.scientificcms.publications.contenttypes.Talk",
descriptionBundle="org.scientificcms.publications.contenttypes.Talk"
)
@MvcAuthoringKit( @MvcAuthoringKit(
createStep = TalkItemCreateStep.class, createStep = TalkItemCreateStep.class,
authoringSteps = { authoringSteps = {

2
sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ExpertiseExtendedPropertiesStep.java
View File

@ -21,7 +21,7 @@ import javax.ws.rs.PathParam;
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a> * @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
*/ */
@RequestScoped @RequestScoped
@Path(MvcAuthoringSteps.PATH_PREFIX + "expertise-extendedproeprties") @Path(MvcAuthoringSteps.PATH_PREFIX + "expertise-extendedproperties")
@Controller @Controller
@MvcAuthoringStepDef( @MvcAuthoringStepDef(
bundle = SciPublicationsUiConstants.BUNDLE, bundle = SciPublicationsUiConstants.BUNDLE,

4
sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/ExpertisePropertiesStep.java
View File

@ -13,8 +13,8 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps;
import org.scientificcms.publications.Expertise; import org.scientificcms.publications.Expertise;
import org.scientificcms.publications.PublicationRepository; import org.scientificcms.publications.PublicationRepository;
import org.scientificcms.publications.SciPublicationsConstants;
import org.scientificcms.publications.contenttypes.ExpertiseItem; import org.scientificcms.publications.contenttypes.ExpertiseItem;
import org.scientificcms.publications.ui.SciPublicationsUiConstants;
import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle; import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
import java.util.Optional; import java.util.Optional;
@ -42,7 +42,7 @@ import javax.ws.rs.PathParam;
) )
@Controller @Controller
@MvcAuthoringStepDef( @MvcAuthoringStepDef(
bundle = SciPublicationsConstants.BUNDLE, bundle = SciPublicationsUiConstants.BUNDLE,
descriptionKey = "authoringsteps.basicproperties.description", descriptionKey = "authoringsteps.basicproperties.description",
labelKey = "authoringsteps.basicproperties.label", labelKey = "authoringsteps.basicproperties.label",
supportedDocumentType = ExpertiseItem.class supportedDocumentType = ExpertiseItem.class

4
sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/GreyLiteraturePropertiesStep.java
View File

@ -10,8 +10,8 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps;
import org.scientificcms.publications.GreyLiterature; import org.scientificcms.publications.GreyLiterature;
import org.scientificcms.publications.PublicationRepository; import org.scientificcms.publications.PublicationRepository;
import org.scientificcms.publications.SciPublicationsConstants;
import org.scientificcms.publications.contenttypes.GreyLiteratureItem; import org.scientificcms.publications.contenttypes.GreyLiteratureItem;
import org.scientificcms.publications.ui.SciPublicationsUiConstants;
import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle; import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
@ -37,7 +37,7 @@ import javax.ws.rs.PathParam;
) )
@Controller @Controller
@MvcAuthoringStepDef( @MvcAuthoringStepDef(
bundle = SciPublicationsConstants.BUNDLE, bundle = SciPublicationsUiConstants.BUNDLE,
descriptionKey = "authoringsteps.basicproperties.description", descriptionKey = "authoringsteps.basicproperties.description",
labelKey = "authoringsteps.basicproperties.label", labelKey = "authoringsteps.basicproperties.label",
supportedDocumentType = GreyLiteratureItem.class supportedDocumentType = GreyLiteratureItem.class

4
sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/InternetArticlePropertiesStep.java
View File

@ -13,8 +13,8 @@ import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps;
import org.scientificcms.publications.InternetArticle; import org.scientificcms.publications.InternetArticle;
import org.scientificcms.publications.PublicationRepository; import org.scientificcms.publications.PublicationRepository;
import org.scientificcms.publications.SciPublicationsConstants;
import org.scientificcms.publications.contenttypes.InternetArticleItem; import org.scientificcms.publications.contenttypes.InternetArticleItem;
import org.scientificcms.publications.ui.SciPublicationsUiConstants;
import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle; import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
import java.util.Optional; import java.util.Optional;
@ -42,7 +42,7 @@ import javax.ws.rs.PathParam;
) )
@Controller @Controller
@MvcAuthoringStepDef( @MvcAuthoringStepDef(
bundle = SciPublicationsConstants.BUNDLE, bundle = SciPublicationsUiConstants.BUNDLE,
descriptionKey = "authoringsteps.basicproperties.description", descriptionKey = "authoringsteps.basicproperties.description",
labelKey = "authoringsteps.basicproperties.label", labelKey = "authoringsteps.basicproperties.label",
supportedDocumentType = InternetArticleItem.class supportedDocumentType = InternetArticleItem.class

6
sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/TalkPropertiesStep.java
View File

@ -5,12 +5,11 @@ import org.librecms.ui.contentsections.ContentSectionNotFoundException;
import org.librecms.ui.contentsections.documents.DocumentNotFoundException; import org.librecms.ui.contentsections.documents.DocumentNotFoundException;
import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef; import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; import org.librecms.ui.contentsections.documents.MvcAuthoringSteps;
import org.scientificcms.publications.SciPublicationsConstants;
import org.scientificcms.publications.Talk; import org.scientificcms.publications.Talk;
import org.scientificcms.publications.contenttypes.TalkItem; import org.scientificcms.publications.contenttypes.TalkItem;
import org.scientificcms.publications.ui.SciPublicationsUiConstants;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.inject.Inject;
import javax.mvc.Controller; import javax.mvc.Controller;
import javax.transaction.Transactional; import javax.transaction.Transactional;
import javax.ws.rs.DefaultValue; import javax.ws.rs.DefaultValue;
@ -20,7 +19,6 @@ import javax.ws.rs.POST;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.PathParam; 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 @Controller
@MvcAuthoringStepDef( @MvcAuthoringStepDef(
bundle = SciPublicationsConstants.BUNDLE, bundle = SciPublicationsUiConstants.BUNDLE,
descriptionKey = "authoringsteps.basicproperties.description", descriptionKey = "authoringsteps.basicproperties.description",
labelKey = "authoringsteps.basicproperties.label", labelKey = "authoringsteps.basicproperties.label",
supportedDocumentType = TalkItem.class supportedDocumentType = TalkItem.class

6
sci-publications/src/main/java/org/scientificcms/publications/ui/contenttypes/WorkingPaperPropertiesStep.java
View File

@ -5,10 +5,9 @@ import org.librecms.ui.contentsections.ContentSectionNotFoundException;
import org.librecms.ui.contentsections.documents.DocumentNotFoundException; import org.librecms.ui.contentsections.documents.DocumentNotFoundException;
import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef; import org.librecms.ui.contentsections.documents.MvcAuthoringStepDef;
import org.librecms.ui.contentsections.documents.MvcAuthoringSteps; 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.WorkingPaper;
import org.scientificcms.publications.contenttypes.WorkingPaperItem; import org.scientificcms.publications.contenttypes.WorkingPaperItem;
import org.scientificcms.publications.ui.SciPublicationsUiConstants;
import javax.enterprise.context.RequestScoped; import javax.enterprise.context.RequestScoped;
import javax.mvc.Controller; import javax.mvc.Controller;
@ -20,7 +19,6 @@ import javax.ws.rs.POST;
import javax.ws.rs.Path; import javax.ws.rs.Path;
import javax.ws.rs.PathParam; 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 @Controller
@MvcAuthoringStepDef( @MvcAuthoringStepDef(
bundle = SciPublicationsConstants.BUNDLE, bundle = SciPublicationsUiConstants.BUNDLE,
descriptionKey = "authoringsteps.basicproperties.description", descriptionKey = "authoringsteps.basicproperties.description",
labelKey = "authoringsteps.basicproperties.label", labelKey = "authoringsteps.basicproperties.label",
supportedDocumentType = WorkingPaperItem.class supportedDocumentType = WorkingPaperItem.class

4
sci-publications/src/main/resources/WEB-INF/views/org/scientificcms/contenttypes/ui/expertise/edit-expertise.xhtml
View File

@ -94,7 +94,7 @@
confirmLabel="#{SciPublicationsUiMessageBundle['experise.basicproperties.orderer.confirm']}" confirmLabel="#{SciPublicationsUiMessageBundle['experise.basicproperties.orderer.confirm']}"
dialogId="remove-orderer-dialog" dialogId="remove-orderer-dialog"
dialogTitle="#{SciPublicationsUiMessageBundle['experise.basicproperties.orderer.title']}" 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])}"
/> />
</c:if> </c:if>
</c:otherwise> </c:otherwise>
@ -134,7 +134,7 @@
confirmLabel="#{SciPublicationsUiMessageBundle['experise.basicproperties.organization.confirm']}" confirmLabel="#{SciPublicationsUiMessageBundle['experise.basicproperties.organization.confirm']}"
dialogId="remove-organization-dialog" dialogId="remove-organization-dialog"
dialogTitle="#{SciPublicationsUiMessageBundle['experise.basicproperties.organization.title']}" 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])}"
/> />
</c:if> </c:if>
</c:otherwise> </c:otherwise>