From e592e1b8a82cc30126f8685bcb64ea005e006bc6 Mon Sep 17 00:00:00 2001
From: Stefan Galinski <stefan@sgalinski.de>
Date: Thu, 14 Dec 2017 19:26:01 +0100
Subject: [PATCH] [BUGFIX] Fix redirect if something breaks in the apply action

---
 Classes/Controller/JoblistController.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Classes/Controller/JoblistController.php b/Classes/Controller/JoblistController.php
index 3db55779..f8920035 100644
--- a/Classes/Controller/JoblistController.php
+++ b/Classes/Controller/JoblistController.php
@@ -231,6 +231,7 @@ class JoblistController extends ActionController {
 	 * @param JobApplication $applyData
 	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\StopActionException
 	 * @throws \InvalidArgumentException
+	 * @throws \TYPO3\CMS\Extbase\Mvc\Exception\InvalidArgumentNameException
 	 */
 	public function applyAction(JobApplication $applyData) {
 		try {
@@ -307,7 +308,13 @@ class JoblistController extends ActionController {
 			$this->redirect('applyForm');
 
 		} catch (\Exception $exception) {
-			$this->forward('applyForm', NULL, NULL, ['applyData' => $applyData, 'error' => $exception->getMessage()]);
+			$job = $applyData->getJob();
+			$jobId = $job !== NULL ? $job->getUid() : NULL;
+			$this->request->setArgument('folderName', $folderName);
+			$this->forward(
+				'applyForm', NULL, NULL,
+				['applyData' => $applyData, 'error' => $exception->getMessage(), 'uid' => $jobId]
+			);
 		}
 	}
 
-- 
GitLab