Skip to content
Snippets Groups Projects
Commit b5dddf4d authored by Eniko Tot's avatar Eniko Tot
Browse files

Merge branch 'master' into task_bootstrap5

parents bdc7357b 96a71706
No related branches found
No related tags found
1 merge request!50Bootstrap 5 Support
Hide whitespace changes
Inline Side-by-side
Showing
with 64 additions and 57 deletions
Classes/Controller/BackendController.php
+ 2
− 2
View file @ b5dddf4d
......@@ -107,9 +107,9 @@ class BackendController extends ActionController {
/** @var BackendUserAuthentication $backendUser */
$backendUser = $GLOBALS['BE_USER'];
if ($filters === []) {
$filters = $backendUser->getModuleData('tools_beuser/index.php/web_SgJobsBackend_filters', 'ses') ?: [];
$filters = $backendUser->getModuleData('web_SgJobsBackend_filters', 'ses') ?: [];
} else {
$backendUser->pushModuleData('tools_beuser/index.php/web_SgJobsBackend_filters', $filters);
$backendUser->pushModuleData('web_SgJobsBackend_filters', $filters);
}
// create docheader + buttons
......
Classes/Controller/JoblistController.php
+ 14
− 20
View file @ b5dddf4d
......@@ -49,6 +49,7 @@ use TYPO3\CMS\Core\Country\CountryProvider;
use TYPO3\CMS\Core\Error\Http\PageNotFoundException;
use TYPO3\CMS\Core\Exception\SiteNotFoundException;
use TYPO3\CMS\Core\Http\ImmediateResponseException;
use TYPO3\CMS\Core\Page\PageRenderer;
use TYPO3\CMS\Core\Resource\Exception\AbstractFileOperationException;
use TYPO3\CMS\Core\Resource\Exception\ExistingTargetFileNameException;
use TYPO3\CMS\Core\Resource\Exception\ExistingTargetFolderException;
......@@ -304,6 +305,12 @@ class JoblistController extends ActionController {
$allJobsCount = $this->jobRepository->findJobsByFilter($filters)->count();
$numberOfPages = (int) ($jobLimit <= 0 ? 0 : \ceil($allJobsCount / $jobLimit));
if ($numberOfPages !== 0 && $currentPageBrowserPage >= $numberOfPages) {
/** @var PageRenderer $pageRenderer */
$pageRenderer = GeneralUtility::makeInstance(PageRenderer::class);
// the PageRenderer contains the content of the current request, the result of the following sub-request will
// be appended to it and we get 2 pages, the current one and the 404 page in one. We flush the PageRenderer
// content here, so it will contain only the 404 page content
$pageRenderer->setBodyContent('');
/** @var ErrorController $errorController */
$errorController = GeneralUtility::makeInstance(ErrorController::class);
$response = $errorController->pageNotFoundAction(
......@@ -525,19 +532,6 @@ class JoblistController extends ActionController {
* @throws NoSuchArgumentException
*/
protected function initializeApplyAction(): void {
$propertyMappingConfiguration = $this->arguments->getArgument('applyData')->getPropertyMappingConfiguration();
$propertyMappingConfiguration->forProperty('job')->allowAllProperties();
// remove the job validator
/** @var ConjunctionValidator $validator */
$validator = $this->arguments->getArgument('applyData')->getValidator();
foreach ($validator->getValidators() as $subValidator) {
/** @var GenericObjectValidator $subValidatorSub */
foreach ($subValidator->getValidators() as $subValidatorSub) {
$subValidatorsSub = $subValidatorSub->getPropertyValidators();
unset($subValidatorsSub['job']);
}
}
}
/**
......@@ -558,11 +552,11 @@ class JoblistController extends ActionController {
$job = $applyData->getJob();
if ($job) {
$applyData->setJobId($job->getJobId());
foreach ($job->getCompanies() as $company) {
foreach ($job->getCompany() as $company) {
/** @var Company $company */
$applyData->setCompany($company);
}
} elseif (!$applyData->getCompany()) {
} elseif (!$applyData->getFirstCompany()) {
/** @var Company $company */
$company = $this->companyRepository->findByUid(
(int) $_POST['tx_sgjobs_jobapplication']['applyData']['company']
......@@ -574,8 +568,8 @@ class JoblistController extends ActionController {
// look for a configured default job, in case of unsolicited application
$applyData->setPid($GLOBALS['TSFE']->id);
if ((!$job || !$applyData->getJobId()) && $applyData->getCompany()) {
$applyData->setJobId($applyData->getCompany()->getJobId());
if ((!$job || !$applyData->getJobId()) && $applyData->getFirstCompany()) {
$applyData->setJobId($applyData->getFirstCompany()->getJobId());
}
if ($applyData->_isNew()) {
......@@ -620,7 +614,7 @@ class JoblistController extends ActionController {
if ($contact !== NULL) {
$mailService->setToAddresses($contact->getEmail());
} else {
$company = $applyData->getCompany();
$company = $applyData->getFirstCompany();
if (($company !== NULL) && $company->getContact() !== NULL) {
$mailService->setToAddresses($company->getContact()->getEmail());
}
......@@ -723,8 +717,8 @@ class JoblistController extends ActionController {
*/
protected function getApplicationMailMarkers(JobApplication $applyData): array {
$location = '';
if ($applyData->getCompany() !== NULL) {
$location = $applyData->getCompany()->getCity();
if ($applyData->getFirstCompany() !== NULL) {
$location = $applyData->getFirstCompany()->getCity();
}
return [
......
Classes/Domain/Model/Job.php
+ 9
− 6
View file @ b5dddf4d
......@@ -107,7 +107,7 @@ class Job extends AbstractEntity {
* @var ObjectStorage<Company>
*/
#[Lazy]
protected $company;
protected $company = NULL;
/**
* @var ObjectStorage<Job>
......@@ -287,25 +287,28 @@ class Job extends AbstractEntity {
}
/**
* @return Company|NULL
* @return ObjectStorage|NULL
*/
public function getCompany() {
if ($this->company instanceof LazyLoadingProxy) {
$this->company->_loadRealInstance();
}
return $this->company->offsetGet(0);
return $this->company;
}
/**
* @return ObjectStorage
* @return Company|NULL
*/
public function getCompanies(): ObjectStorage {
public function getFirstCompany(): ?Company {
if ($this->company instanceof LazyLoadingProxy) {
$this->company->_loadRealInstance();
}
return $this->company;
if ($this->company->count() === 0) {
return NULL;
}
return $this->company->offsetGet(0);
}
/**
......
Classes/Domain/Model/JobApplication.php
+ 10
− 2
View file @ b5dddf4d
......@@ -53,7 +53,7 @@ class JobApplication extends AbstractEntity {
* @var ObjectStorage<Company>
*/
#[Lazy]
protected $company;
protected $company = NULL;
/**
* @var Job $job
......@@ -477,13 +477,21 @@ class JobApplication extends AbstractEntity {
}
/**
* @return Company|NULL
* @return ObjectStorage|NULL
*/
public function getCompany() {
if ($this->company instanceof LazyLoadingProxy) {
$this->company->_loadRealInstance();
}
return $this->company;
}
public function getFirstCompany(): ?Company {
if ($this->company instanceof LazyLoadingProxy) {
$this->company->_loadRealInstance();
}
if ($this->company->count() === 0) {
return NULL;
}
......
Classes/Domain/Repository/JobRepository.php
+ 1
− 1
View file @ b5dddf4d
......@@ -339,7 +339,7 @@ class JobRepository extends Repository {
$query->getQuerySettings()->setRespectStoragePage(FALSE);
}
$company = $job->getCompany();
$company = $job->getFirstCompany();
$department = $job->getDepartment();
if ($limit > 0) {
......
Configuration/SgMail/ApplicantMail.php
+ 1
− 1
View file @ b5dddf4d
......@@ -26,7 +26,7 @@ EOT
'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.jobtitle'
],
[
'marker' => 'application.company.location',
'marker' => 'application.firstCompany.location',
'type' => MailTemplateService::MARKER_TYPE_STRING,
'value' => 'München',
'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.location'
......
Configuration/SgMail/ApplicationMail.php
+ 2
− 2
View file @ b5dddf4d
......@@ -8,7 +8,7 @@ return [
'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:mail.application.description',
'subject' => 'Eine neue Bewerbung',
'templateContent' => <<<EOT
Eine neue {f:if(condition: '{application.jobTitle}', then: 'Bewerbung als <b>{application.jobTitle}</b> für den Standort <b>{application.company.city}</b>.', else: 'Initiativbewerbung für den Standort <b>{application.company.city}</b>.')}
Eine neue {f:if(condition: '{application.jobTitle}', then: 'Bewerbung als <b>{application.jobTitle}</b> für den Standort <b>{application.firstCompany.city}</b>.', else: 'Initiativbewerbung für den Standort <b>{application.firstCompany.city}</b>.')}
Geschlecht: {f:translate(key: 'frontend.apply.gender.{application.gender}', extensionName: 'SgJobs')}
......@@ -51,7 +51,7 @@ EOT
'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.jobtitle'
],
[
'marker' => 'application.company.location',
'marker' => 'application.firstCompany.location',
'type' => MailTemplateService::MARKER_TYPE_STRING,
'value' => 'München',
'description' => 'LLL:EXT:sg_jobs/Resources/Private/Language/locallang.xlf:application_mail.marker.location'
......
Configuration/TCA/tx_sgjobs_domain_model_job.php
+ 1
− 0
View file @ b5dddf4d
......@@ -311,6 +311,7 @@ $columns = [
'foreign_table' => 'tx_sgjobs_domain_model_company',
'foreign_table_where' => ' AND tx_sgjobs_domain_model_company.sys_language_uid IN (0,-1) ORDER BY tx_sgjobs_domain_model_company.sorting ASC',
'minitems' => 1,
'multiple' => 1,
'fieldControl' => [
'editPopup' => [
'disabled' => FALSE,
......
Resources/Private/Partials/ApplyFormSchema.html
+ 2
− 2
View file @ b5dddf4d
......@@ -76,8 +76,8 @@
"hiringOrganization": {leftBrace}
"@type": "Organization",
"name": "{job.company.name}",
"sameAs": "{f:uri.typolink(parameter: job.company.identifyingUrl, absolute: 'TRUE')}",
"name": "{job.firstCompany.name}",
"sameAs": "{f:uri.typolink(parameter: job.firstCompany.identifyingUrl, absolute: 'TRUE')}",
"department": {leftBrace}
"@type": "Organization",
"name": "{job.department.title}"
......
Resources/Private/Partials/Backend/Filter.html
+ 2
− 1
View file @ b5dddf4d
......@@ -14,6 +14,7 @@
optionLabelField="name"
optionValueField="city"
options="{locationOptions}"
value="{filters.locations}"
id="filter-locations" />
<small>
<f:format.raw><f:translate key="backend.filters.locations.description" /></f:format.raw>
......@@ -23,7 +24,7 @@
<div class="col-xs-6 col-6 col-sm-6">
<div class="form-group">
<label for="filter-search"><f:translate key="backend.filters.search" /></label>
<f:form.textfield class="reset-me form-control" property="search" id="filter-search" />
<f:form.textfield class="reset-me form-control" value="{filters.search}" property="search" id="filter-search" />
</div>
</div>
<div class="form-group">
......
Resources/Private/Templates/Backend/Index.html
+ 1
− 1
View file @ b5dddf4d
......@@ -46,7 +46,7 @@
</td>
<td>
<be:link.editRecord uid="{job.uid}" table="tx_sgjobs_domain_model_job">
<span>{job.title} - <sg:backend.companyLabel uid="{job.uid}" companyraw="{job.company}"></sg:backend.companyLabel> </span>
<span>{job.title} - <sg:backend.companyLabel uid="{job.uid}" companyraw="{job.firstCompany}"></sg:backend.companyLabel> </span>
</be:link.editRecord>
</td>
<td nowrap="nowrap" class="col-control">
......
Resources/Private/Templates/Joblist/ApplyForm.html
+ 17
− 17
View file @ b5dddf4d
......@@ -91,13 +91,13 @@
<f:if condition="!{job.hideApplyByPostal}">
<p>
<f:format.raw><f:translate key="frontend.job.via.post" /></f:format.raw><br>
{job.company.name}<br>
{job.firstCompany.name}<br>
<f:if condition="{job.contact}">
<f:then>
{job.contact.title} {job.contact.firstName} {job.contact.lastName}<br>
</f:then>
<f:else>
{job.company.contact.title} {job.company.contact.firstName} {job.company.contact.lastName}<br>
{job.firstCompany.contact.title} {job.firstCompany.contact.firstName} {job.firstCompany.contact.lastName}<br>
</f:else>
</f:if>
<f:if condition="{job.contact} && {job.contact.street}">
......@@ -112,25 +112,25 @@
</f:if>
</f:then>
<f:else>
<f:if condition="{job.company.contact} && {job.company.contact.street}">
<f:if condition="{job.firstCompany.contact} && {job.firstCompany.contact.street}">
<f:then>
{job.company.contact.street}<br>
<f:if condition="{job.company.contact.state}">
{job.company.contact.state}<br>
{job.firstCompany.contact.street}<br>
<f:if condition="{job.firstCompany.contact.state}">
{job.firstCompany.contact.state}<br>
</f:if>
{job.company.contact.zip} {job.company.contact.city}
<f:if condition="{job.company.contact.country}">
<br>{job.company.contact.country}
{job.firstCompany.contact.zip} {job.firstCompany.contact.city}
<f:if condition="{job.firstCompany.contact.country}">
<br>{job.firstCompany.contact.country}
</f:if>
</f:then>
<f:else>
{job.company.street}<br>
<f:if condition="{job.company.state}">
{job.company.state}<br>
{job.firstCompany.street}<br>
<f:if condition="{job.firstCompany.state}">
{job.firstCompany.state}<br>
</f:if>
{job.company.zip} {job.company.city}
<f:if condition="{job.company.country}">
<br>{job.company.country}
{job.firstCompany.zip} {job.firstCompany.city}
<f:if condition="{job.firstCompany.country}">
<br>{job.firstCompany.country}
</f:if>
</f:else>
</f:if>
......@@ -149,7 +149,7 @@
<f:format.html parseFuncTSPath="lib.parseFunc"><a href="mailto:{job.contact.email}"><f:translate key="frontend.emailContact"/></a></f:format.html>
</f:then>
<f:else>
<f:format.html parseFuncTSPath="lib.parseFunc"><a href="mailto:{job.company.contact.email}"><f:translate key="frontend.emailContact"/></a></f:format.html>
<f:format.html parseFuncTSPath="lib.parseFunc"><a href="mailto:{job.firstCompany.contact.email}"><f:translate key="frontend.emailContact"/></a></f:format.html>
</f:else>
</f:if>
</p>
......@@ -170,7 +170,7 @@
<f:render section="contactBox" arguments="{contact: job.contact, hideApplyByEmail: job.hideApplyByEmail}" />
</f:then>
<f:else>
<f:render section="contactBox" arguments="{contact: job.company.contact, hideApplyByEmail: job.hideApplyByEmail}" />
<f:render section="contactBox" arguments="{contact: job.firstCompany.contact, hideApplyByEmail: job.hideApplyByEmail}" />
</f:else>
</f:if>
<f:if condition="{job.attachment}">
......
composer.json
+ 1
− 1
View file @ b5dddf4d
......@@ -6,7 +6,7 @@
"license": [
"GPL-2.0-or-later"
],
"version": "6.0.0-dev",
"version": "5.7.4",
"support": {
"issues": "https://gitlab.sgalinski.de/typo3/sg_jobs"
},
......
ext_emconf.php
+ 1
− 1
View file @ b5dddf4d
......@@ -4,7 +4,7 @@ $EM_CONF['sg_jobs'] = [
'title' => 'Jobs',
'description' => 'Manage and display your Job offers.',
'category' => 'plugin',
'version' => '6.0.0-dev',
'version' => '5.7.4',
'state' => 'stable',
'author' => 'Stefan Galinski',
'author_email' => 'stefan@sgalinski.de',
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment