This is an automated email from the ASF dual-hosted git repository. dklco pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-app-cms.git
commit 257c77a25b5c255266aa00f6c509a0e5b8969522 Author: Dan Klco <[email protected]> AuthorDate: Thu Nov 14 08:13:36 2019 -0500 Fixing an issue if the last modified field doesn't contain a calendar --- .../cms/columns/lastmodified/lastmodified.jsp | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp index 2811532..01c2852 100644 --- a/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp +++ b/ui/src/main/resources/jcr_root/libs/sling-cms/components/cms/columns/lastmodified/lastmodified.jsp @@ -19,9 +19,15 @@ <%@include file="/libs/sling-cms/global.jsp"%> <c:set var="modifiedProperty" value="${colConfig.valueMap.subPath}jcr:lastModified" /> <c:set var="modifiedByProperty" value="${colConfig.valueMap.subPath}jcr:lastModifiedBy" /> -<fmt:formatDate var="lastModified" type = "both" dateStyle = "medium" timeStyle = "medium" value="${resource.valueMap[modifiedProperty].time}" /> -<c:set var="colValue" value="${lastModified} - ${resource.valueMap[modifiedByProperty]}" /> -<td title="${sling:encode(colValue,'HTML_ATTR')}"> - <sling:encode value="${lastModified}" mode="HTML" /><br/> - <sling:encode value="${resource.valueMap[modifiedByProperty]}" mode="HTML" /> -</td> \ No newline at end of file +<c:catch var="dateEx"> + <fmt:formatDate var="lastModified" type = "both" dateStyle = "medium" timeStyle = "medium" value="${resource.valueMap[modifiedProperty].time}" /> + <c:set var="colValue" value="${lastModified} - ${resource.valueMap[modifiedByProperty]}" /> + <td title="${sling:encode(colValue,'HTML_ATTR')}"> + <sling:encode value="${lastModified}" mode="HTML" /><br/> + <sling:encode value="${resource.valueMap[modifiedByProperty]}" mode="HTML" /> + </td> +</c:catch> +<c:if test="${dateEx != null}"> + <td title=""> + </td> +</c:if> \ No newline at end of file
