From c81e2757e7ada5d374a7d670b079e7feffc2509d Mon Sep 17 00:00:00 2001
From: Jens Pelzetter <jens@jp-digital.de>
Date: Wed, 18 Aug 2021 19:42:56 +0200
Subject: [PATCH] Display of error messages in publish step.

---
 .../ui/contentsection/documents/publish.xhtml | 35 +++++++++++++------
 .../ui/DefaultAuthoringStepsBundle.properties |  6 ++++
 .../DefaultAuthoringStepsBundle_de.properties |  6 ++++
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/publish.xhtml b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/publish.xhtml
index ff65d2ead..9974a23b0 100644
--- a/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/publish.xhtml
+++ b/ccm-cms/src/main/resources/WEB-INF/views/org/librecms/ui/contentsection/documents/publish.xhtml
@@ -6,18 +6,8 @@
       xmlns:ui="http://xmlns.jcp.org/jsf/facelets">
     <ui:composition template="/WEB-INF/views/org/librecms/ui/contentsection/documents/authoringstep.xhtml">
 
-        <!--<ui:param name="activePage" value="document" />-->
         <ui:param name="authoringStep" value="publish" />
-        <!--<ui:param name="title" value="#{CmsAdminMessages['contentsection.documents.publishstep.title']}" />-->
 
-<!--        <ui:define name="breadcrumb">
-            <ui:include src="document-breadcrumbs.xhtml" />
-            <li aria-current="page" class="breadcrumb-item">
-                #{CmsAdminMessages['contentsection.document.publishstep.title']}
-            </li>
-        </ui:define>-->
-
-        <!--<ui:define name="main">-->
         <ui:define name="authoringStep">
             <h1>#{CmsDefaultStepsMessageBundle.getMessage('publish.title', [CmsSelectedDocumentModel.itemTitle])}</h1>
             
@@ -26,6 +16,31 @@
                     #{CmsDefaultStepsMessageBundle['publish.no_lifecycle_selected']}
                 </div>
             </c:if>
+            <c:if test="#{missingStartDateTime}">
+                <div class="alert alert-danger">
+                    #{CmsDefaultStepsMessageBundle['publish.no_start_date_time']}
+                </div>
+            </c:if>
+            <c:if test="#{invalidStartDate}">
+                <div class="alert alert-danger">
+                    #{CmsDefaultStepsMessageBundle.getMessage('publish.invalid_start_date', [startDate])}
+                </div>
+            </c:if>
+            <c:if test="#{invalidStartTime}">
+                <div class="alert alert-danger">
+                    #{CmsDefaultStepsMessageBundle.getMessage('publish.invalid_start_time', [startTime])}
+                </div>
+            </c:if>
+            <c:if test="#{invalidEndDate}">
+                <div class="alert alert-danger">
+                    #{CmsDefaultStepsMessageBundle.getMessage('publish.invalid_end_date', [endDate])}
+                </div>
+            </c:if>
+            <c:if test="#{invalidEndTime}">
+                <div class="alert alert-danger">
+                    #{CmsDefaultStepsMessageBundle.getMessage('publish.invalid_end_time', [endTime])}
+                </div>
+            </c:if>
                   
             <c:choose>
                 <c:when test="#{CmsDocumentPublishStepModel.live}">
diff --git a/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle.properties b/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle.properties
index 99fa2aaf6..391367781 100644
--- a/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle.properties
+++ b/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle.properties
@@ -339,3 +339,9 @@ media.title=Media for Content Item {0}
 relatedinfo.title=Related Info for Content Item {0}
 publish.title=Publish Content Item {0}
 publishstep.lifecycle_enddatetime.help=Date and time of the end of the lifecycle (optional).
+publish.no_lifecycle_selected=No lifecycle has been selected.
+publish.no_start_date_time=No start date or start time provided.
+publish.invalid_start_date=The start date {0} does not match the expected format. Expected is an ISO 8601 date.
+publish.invalid_start_time=The start time {0} does not match the expected format. Expected is an ISO 8601 time.
+publish.invalid_end_date=The end date {0} does not match the expected format. Expected is an ISO 8601 date.
+publish.invalid_end_time=The end time {0} does not match the expected format. Expected is an ISO 8601 time.
diff --git a/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle_de.properties b/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle_de.properties
index 231f91deb..a4f1c8072 100644
--- a/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle_de.properties
+++ b/ccm-cms/src/main/resources/org/librecms/ui/DefaultAuthoringStepsBundle_de.properties
@@ -339,3 +339,9 @@ media.title=Medien f\u00fcr Dokument {0}
 relatedinfo.title=Weiterf\u00fchrende Informationen f\u00fcr Dokument {0}
 publish.title=Dokument {0} publizieren
 publishstep.lifecycle_enddatetime.help=Datum und Uhrzeit des Endes des Lebenszyklus (optional).
+publish.no_lifecycle_selected=Es wurde kein Lebenszyklus ausgew\u00e4hlt.
+publish.no_start_date_time=Es wurde keine Start-Datum oder keine Start-Zeit angegeben.
+publish.invalid_start_date=Das Start-Datum {0} entspricht nicht dem erwarteten Format. Das Datum muss im ISO 8601-Format angegeben werden.
+publish.invalid_start_time=Die Start-Zeit {0} entspricht nicht dem erwarteten Format. Das Zeit muss im ISO 8601-Format angegeben werden.
+publish.invalid_end_date=Das End-Datum {0} entspricht nicht dem erwarteten Format. Das Datum muss im ISO 8601-Format angegeben werden.
+publish.invalid_end_time=Die End-Zeit {0} entspricht nicht dem erwarteten Format. Das Zeit muss im ISO 8601-Format angegeben werden.