--- a/src/main/webapp/WEB-INF/jsp/variant-form.jsp Thu Jan 01 16:39:09 2026 +0100 +++ b/src/main/webapp/WEB-INF/jsp/variant-form.jsp Thu Jan 01 16:47:11 2026 +0100 @@ -31,10 +31,6 @@ <jsp:useBean id="viewmodel" type="de.uapcore.lightpit.viewmodel.VariantEditView" scope="request" /> <c:set var="project" scope="page" value="${viewmodel.projectInfo.project}"/> <c:set var="variant" scope="page" value="${viewmodel.variant}"/> -<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}/variants/"/> -</c:if> <form action="./projects/${project.node}/variants/-/commit" method="post"> <table class="formtable" style="width: 70ch"> @@ -85,8 +81,8 @@ <tr> <td colspan="2"> <input type="hidden" name="id" value="${variant.id}"/> - <input type="hidden" name="returnLink" value="${returnLink}"/> - <a href="${returnLink}" class="button"> + <input type="hidden" name="returnLink" value="${viewmodel.returnLink}"/> + <a href="${viewmodel.returnLink}" class="button"> <fmt:message key="button.cancel"/> </a> <button type="submit"><fmt:message key="button.okay"/></button>