Version 1 5

Classes/Controller/JoblistController.php

@@ -156,12 +156,18 @@ class JoblistController extends ActionController {
 		$this->view->assign('folderName', $folderName);
 
 		$job = NULL;
+
 		if (!$uid !== NULL) {
 			/** @var Job $job */
 			$job = $this->jobRepository->findByUid($uid);
 			if ($job) {
 				$GLOBALS['TSFE']->page['titlebyextension'] = $job->getTitle();
 				$GLOBALS['TSFE']->page['description'] = substr($job->getDescription(), 0, 200);
+			} else {
+				$storagePid = (int) $this->configurationManager->getConfiguration(
+					ConfigurationManagerInterface::CONFIGURATION_TYPE_FRAMEWORK
+				)['persistence']['storagePid'];
+				$this->view->assign('companies', $this->companyRepository->getAllCompanies($storagePid));
 			}
 			$this->view->assign('job', $job);
 		}
@@ -290,16 +296,14 @@ class JoblistController extends ActionController {
 			if ($job !== NULL) {
 				/** @var Contact $contact */
 				$contact = $job->getContact();
-				if ($contact === NULL) {
-					$contact = $this->contactRepository->findByUid((int) $this->settings['defaultContactId']);
-				}
-			} else {
-				$contact = $this->contactRepository->findByUid((int) $this->settings['defaultContactId']);
 			}
 
 			if ($contact !== NULL) {
 				$mailService->setToAddresses($contact->getEmail());
+			} else {
+				$mailService->setToAddresses($applyData->getCompany()->getContact()->getEmail());
 			}
+
 			$mailService->setMarkers(['application' => $applyData]);
 			$mailService->setIgnoreMailQueue(TRUE);