Some error messages where not shown in the authoring steps for
publicationspull/1/head
parent
eb9cd0b4ea
commit
bec3a90529
|
|
@ -495,7 +495,7 @@ public class ArticleInCollectedVolumePropertiesStep
|
|||
final String documentPath,
|
||||
final String collectedVolumeIdentifier
|
||||
) {
|
||||
models.put("articleNotFound", collectedVolumeIdentifier);
|
||||
models.put("collectedVolumeNotFound", collectedVolumeIdentifier);
|
||||
return showStep(sectionIdentifier, documentPath);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -14,7 +14,6 @@ import org.scientificcms.publications.InProceedings;
|
|||
import org.scientificcms.publications.Proceedings;
|
||||
import org.scientificcms.publications.ProceedingsManager;
|
||||
import org.scientificcms.publications.PublicationRepository;
|
||||
import org.scientificcms.publications.contenttypes.ArticleInCollectedVolumeItem;
|
||||
import org.scientificcms.publications.contenttypes.InProceedingsItem;
|
||||
import org.scientificcms.publications.ui.SciPublicationsUiConstants;
|
||||
import org.scientificcms.publications.ui.SciPublicationsUiMessageBundle;
|
||||
|
|
|
|||
|
|
@ -42,7 +42,11 @@ import javax.ws.rs.Path;
|
|||
import javax.ws.rs.PathParam;
|
||||
|
||||
/**
|
||||
*
|
||||
*<c:if test="#{authorshipNotFound != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('basicproperties.errors.authorship_not_found', [authorshipNotFound])}
|
||||
</div>
|
||||
</c:if>
|
||||
* @author <a href="mailto:jens.pelzetter@googlemail.com">Jens Pelzetter</a>
|
||||
*/
|
||||
@RequestScoped
|
||||
|
|
|
|||
|
|
@ -14,6 +14,14 @@
|
|||
<ui:param name="authoringStepTitle"
|
||||
value="#{SciPublicationsUiMessageBundle.getMessage('articleincollectedvolume.basicproperties.header', [SciCmsPublicationPropertiesStepModel.name])}" />
|
||||
|
||||
<ui:define name="publicationMessages">
|
||||
<c:if test="#{collectedVolumeNotFound != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('articleincollectedvolume.basicproperties.errors.collectedvolume_not_found', [collectedVolumeNotFound])}
|
||||
</div>
|
||||
</c:if>
|
||||
</ui:define>
|
||||
|
||||
<ui:define name="publicationBasicPropertiesForm">
|
||||
|
||||
<bootstrap:formGroupNumber
|
||||
|
|
|
|||
|
|
@ -14,6 +14,20 @@
|
|||
<ui:param name="authoringStepTitle"
|
||||
value="#{SciPublicationsUiMessageBundle.getMessage('collectedvolume.basicproperties.header', [SciCmsPublicationPropertiesStepModel.name])}" />
|
||||
|
||||
<ui:define name="publicationWithPublisherMessages">
|
||||
<c:if test="#{articleNotFound != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('collectedvolume.basicproperties.errors.article_not_found', [articleNotFound])}
|
||||
</div>
|
||||
</c:if>
|
||||
|
||||
<c:if test="#{articleNotPartOfCollectedVolume != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('collectedvolume.basicproperties.errors.article_not_part_of_collected_volume', [articleNotPartOfCollectedVolume])}
|
||||
</div>
|
||||
</c:if>
|
||||
</ui:define>
|
||||
|
||||
<ui:define name="publicationWithPublisherProperties">
|
||||
|
||||
<h3 class="mt-5">#{SciPublicationsUiMessageBundle['collectedvolume.basicproperties.articles.header']}</h3>
|
||||
|
|
|
|||
|
|
@ -7,6 +7,16 @@
|
|||
xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
|
||||
<ui:composition template="/WEB-INF/views/org/scientificcms/contenttypes/ui/edit-publication.xhtml">
|
||||
|
||||
<ui:define name="publicationMessages">
|
||||
<c:if test="#{publisherNotFound != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('basicproperties.errors.publisher_not_found', [publisherNotFound])}
|
||||
</div>
|
||||
</c:if>
|
||||
|
||||
<ui:insert name="publicationWithPublisherMessages" />
|
||||
</ui:define>
|
||||
|
||||
<ui:define name="publicationProperties">
|
||||
|
||||
<h3 class="mt-5">#{SciPublicationsUiMessageBundle['publicationwithpublisher.publisher']}</h3>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,8 @@
|
|||
#{SciPublicationsUiMessageBundle.getMessage('basicproperties.errors.publisher_not_found', [publisherNotFound])}
|
||||
</div>
|
||||
</c:if>
|
||||
|
||||
<ui:insert name="publicationMessages" />
|
||||
|
||||
<template id="authors-sort-error-general">
|
||||
<div class="alert alert-warning mt-3" role="alert">
|
||||
|
|
|
|||
|
|
@ -14,6 +14,14 @@
|
|||
<ui:param name="authoringStepTitle"
|
||||
value="#{SciPublicationsUiMessageBundle.getMessage('inproceedings.basicproperties.header', [SciCmsPublicationPropertiesStepModel.name])}" />
|
||||
|
||||
<ui:define name="publicationMessages">
|
||||
<c:if test="#{proceedingsNotFound != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('inproceedings.basicproperties.errors.proceedings_not_found', [proceedingsNotFound])}
|
||||
</div>
|
||||
</c:if>
|
||||
</ui:define>
|
||||
|
||||
<ui:define name="publicationBasicPropertiesForm">
|
||||
|
||||
<bootstrap:formGroupNumber
|
||||
|
|
|
|||
|
|
@ -14,6 +14,38 @@
|
|||
<ui:param name="authoringStepTitle"
|
||||
value="#{SciPublicationsUiMessageBundle.getMessage('proceedings.basicproperties.header', [SciCmsPublicationPropertiesStepModel.name])}" />
|
||||
|
||||
<ui:define name="publicationWithPublisherMessages">
|
||||
<c:if test="#{invalidStartDate != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('proceedings.basicproperties.errors.start_date_invalid', [invalidStartDate])}
|
||||
</div>
|
||||
</c:if>
|
||||
|
||||
<c:if test="#{invalidEndDate != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('proceedings.basicproperties.errors.end_date_invalid', [invalidEndDate])}
|
||||
</div>
|
||||
</c:if>
|
||||
|
||||
<c:if test="#{paperNotFound != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('basicproperties.errors.paper_not_found', [paperNotFound])}
|
||||
</div>
|
||||
</c:if>
|
||||
|
||||
<c:if test="#{paperNotPartOfProceedings != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('basicproperties.errors.paper_not_part_of_proceedings', [paperNotPartOfProceedings])}
|
||||
</div>
|
||||
</c:if>
|
||||
|
||||
<c:if test="#{organizerNotFound != null}">
|
||||
<div class="alert alert-warning" role="alert">
|
||||
#{SciPublicationsUiMessageBundle.getMessage('basicproperties.errors.organizer_not_found', [organizerNotFound])}
|
||||
</div>
|
||||
</c:if>
|
||||
</ui:define>
|
||||
|
||||
<ui:define name="publicationWithPublisherProperties">
|
||||
|
||||
<h3 class="mt-5">#{SciPublicationsUiMessageBundle['proceedings.basicproperties.papers.header']}</h3>
|
||||
|
|
|
|||
|
|
@ -527,3 +527,12 @@ inproceedings.basicproperties.proceedings.remove.title=Remove paper from Proceed
|
|||
inproceedings.basicproperties.proceedings.remove.message=Are you sure to remove the paper {0} from the Proceedings {1}?
|
||||
inproceedings.extendedproperties.header=Edit extended properties of Inproceedings {0}
|
||||
proceedings.extendedproperties.header=Extended Properties of Proceedings {0}
|
||||
collectedvolume.basicproperties.errors.article_not_found=The selected article {0} was not found.
|
||||
collectedvolume.basicproperties.errors.article_not_part_of_collected_volume=The article {0} was selected for removal from this Collected Volume, but is not part of this Collected Volume.
|
||||
articleincollectedvolume.basicproperties.errors.collectedvolume_not_found=The selected Collected Volume with the identifier {0} was not found.
|
||||
proceedings.basicproperties.errors.start_date_invalid=The provided start date {0} is not a valid date.
|
||||
proceedings.basicproperties.errors.end_date_invalid=The provided end date {0} is not a valid date.
|
||||
basicproperties.errors.paper_not_found=The selected paper {0} was not found.
|
||||
basicproperties.errors.paper_not_part_of_proceedings=The paper {0} was selected for removal from these Proceeedings, but is not part of these Proceedings.
|
||||
basicproperties.errors.organizer_not_found=The selected organizer {0} was found.
|
||||
inproceedings.basicproperties.errors.proceedings_not_found=The selected Proceedings {0} were not found.
|
||||
|
|
|
|||
|
|
@ -527,3 +527,12 @@ inproceedings.basicproperties.proceedings.remove.title=Beitrag aus Tagungsband e
|
|||
inproceedings.basicproperties.proceedings.remove.message=Sind Sie sicher, dass Sie den Beitrag {0} aus dem Tagungsband {1} entfernen wollen?
|
||||
inproceedings.extendedproperties.header=Tagungsbandbeitrag {0} bearbeiten
|
||||
proceedings.extendedproperties.header=Erweiterte Eigenschaften des Tagungsbandes {0}
|
||||
collectedvolume.basicproperties.errors.article_not_found=Der ausgew\u00e4hlte Artikel konnte nicht gefunden werden.
|
||||
collectedvolume.basicproperties.errors.article_not_part_of_collected_volume=Der Artikel {0} soll aus diesem Sammelband entfernt werden, ist aber nicht Teil dieses Sammelbandes.
|
||||
articleincollectedvolume.basicproperties.errors.collectedvolume_not_found=Das ausgew\u00e4hlte Sammelband {0} wurde nicht gefunden.
|
||||
proceedings.basicproperties.errors.start_date_invalid=Das f\u00fcr den Beginn angegebene Datum {0} ist kein valides Datum.
|
||||
proceedings.basicproperties.errors.end_date_invalid=Das f\u00fcr das Ende angegebene Datum {0} ist kein valides Datum.
|
||||
basicproperties.errors.paper_not_found=Der ausgew\u00e4hlte Beitrag {0} wurde nicht gefunden.
|
||||
basicproperties.errors.paper_not_part_of_proceedings=Der Beitrag {0} soll aus diesem Tagungsband entfernt werden, ist aber nicht Teil dieses Tagungsbandes.
|
||||
basicproperties.errors.organizer_not_found=Der ausgew\u00e4hlte Organisator wurde nicht gefunden.
|
||||
inproceedings.basicproperties.errors.proceedings_not_found=Der ausgew\u00e4hlte Tagungsband {0} wurde nicht gefunden.
|
||||
|
|
|
|||
Loading…
Reference in New Issue