--- a/src/main/webapp/WEB-INF/jsp/component-form.jsp Mon Sep 22 20:00:59 2025 +0200 +++ b/src/main/webapp/WEB-INF/jsp/component-form.jsp Sat Oct 04 13:34:33 2025 +0200 @@ -31,6 +31,10 @@ <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.ComponentEditView" scope="request" /> <c:set var="component" scope="page" value="${viewmodel.component}"/> <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/> +<c:set scope="page" var="returnLink" value="${requestScope[Constants.REQ_ATTR_REFERER]}"/> +<c:if test="${empty returnLink}"> + <c:set scope="page" var="returnLink" value="./projects/${project.node}/components/"/> +</c:if> <form action="./projects/${project.node}/components/-/commit" method="post"> <table class="formtable" style="width: 70ch"> @@ -94,7 +98,8 @@ <tr> <td colspan="2"> <input type="hidden" name="id" value="${component.id}"/> - <a href="./projects/${project.node}/components/" class="button"> + <input type="hidden" name="returnLink" value="${returnLink}"/> + <a href="${returnLink}" class="button"> <fmt:message key="button.cancel"/> </a> <button type="submit"><fmt:message key="button.okay"/></button>