1.1 --- a/src/main/webapp/WEB-INF/dynamic_fragments/error.jsp Wed May 13 21:10:23 2020 +0200
1.2 +++ b/src/main/webapp/WEB-INF/dynamic_fragments/error.jsp Wed May 13 21:46:26 2020 +0200
1.3 @@ -28,10 +28,10 @@
1.4 <%@page import="de.uapcore.lightpit.modules.ErrorModule" %>
1.5 <%@taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
1.6 <%@taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
1.7 -
1.8 -<jsp:useBean id="exception" scope="request" type="java.lang.Throwable"/>
1.9 +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
1.10
1.11 <c:set scope="page" var="errorCode" value="${requestScope[ErrorModule.REQ_ATTR_ERROR_CODE]}"/>
1.12 +<c:set scope="page" var="returnLink" value="${requestScope[ErrorModule.REQ_ATTR_RETURN_LINK]}"/>
1.13
1.14 <div id="error-page">
1.15 <h1><fmt:message key="h1"/></h1>
1.16 @@ -48,11 +48,18 @@
1.17 <th><fmt:message key="errorTimestamp" />:</th>
1.18 <td><fmt:formatDate type="both" value="<%= new java.util.Date()%>"/></td>
1.19 </tr>
1.20 + <%--@elvariable id="exception" type="java.lang.Exception"--%>
1.21 <c:if test="${not empty exception}">
1.22 <tr>
1.23 <th><fmt:message key="errorExceptionText" />:</th>
1.24 <td>${exception.class.name} - ${exception.message}</td>
1.25 </tr>
1.26 </c:if>
1.27 + <c:if test="${fn:startsWith(returnLink, baseHref)}">
1.28 + <tr>
1.29 + <th><fmt:message key="errorReturnLink" />:</th>
1.30 + <td><a href="${returnLink}">${returnLink}</a></td>
1.31 + </tr>
1.32 + </c:if>
1.33 </table>
1.34 </div>
