Skip to content
Snippets Groups Projects
Commit 3edd6201 authored by Torsten Oppermann's avatar Torsten Oppermann
Browse files

[TASK] REsolving merge conflict, composer dependency for static info tables de

parent 6cfaea16
No related branches found
No related tags found
No related merge requests found
......@@ -81,7 +81,8 @@ class BackendController extends ActionController {
/** @var ObjectStorage $jobs */
$jobs = $this->jobRepository->findJobs($pageUid, $filters);
$totalJobCount = \count($this->jobRepository->findJobs($pageUid));
$totalJobCount = \count($jobs);
$this->view->assign('pages', BackendService::getPagesWithJobRecords());
$this->view->assign('pageUid', $pageUid);
......@@ -105,6 +106,8 @@ class BackendController extends ActionController {
}
} catch (\Exception $exception) {
debug($exception);
// check for NULL value in view and render an error message
$this->view->assign('docHeader', NULL);
}
......
......@@ -29,7 +29,6 @@ namespace SGalinski\SgJobs\Domain\Repository;
use TYPO3\CMS\Core\Database\ConnectionPool;
use TYPO3\CMS\Core\Database\DatabaseConnection;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Extbase\Object\ObjectManager;
use TYPO3\CMS\Extbase\Persistence\QueryInterface;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface;
use TYPO3\CMS\Extbase\Persistence\QueryResultInterface as ExtbaseQueryResultInterface;
......@@ -76,19 +75,26 @@ class JobRepository extends Repository {
);
if ($filters['locations'] !== '' && $filters['locations'] !== NULL) {
foreach ($filters['locations'] as $location) {
$statement->andWhere(
$queryBuilder->expr()->eq(
'a.company', $queryBuilder->createNamedParameter($location)
)
);
}
$statement->andWhere(
$queryBuilder->expr()->eq(
'b.city', $queryBuilder->createNamedParameter($filters['locations'])
)
);
}
if ($filters['search'] !== '' && $filters['search'] !== NULL) {
$statement->andWhere(
$queryBuilder->expr()->eq(
'a.description', $queryBuilder->createNamedParameter($filters['search'])
)
);
}
if ($filters['search'] !== '' && $filters['search'] !== NULL) {
$statement->andWhere(
$queryBuilder->expr()->like(
'a.title', $queryBuilder->createNamedParameter('%' . $filters['search'] . '%')
$queryBuilder->expr()->eq(
'a.title', $queryBuilder->createNamedParameter($filters['search'])
)
);
}
......
......@@ -14,6 +14,7 @@
"roave/security-advisories": "dev-master",
"typo3/cms-core": "7.6.0 - 8.7.99",
"sjbr/static-info-tables": "^6.5.0",
"sjbr/static-info-tables-de": "^6.4.0",
"sgalinski/sg-mail": "^4.1"
},
"replace": {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment