Fix incorrect treatment of boolean value in filtersettings
This commit is contained in:
@@ -136,7 +136,7 @@ class FilterSettings implements \JsonSerializable
|
|||||||
/**
|
/**
|
||||||
* @var bool
|
* @var bool
|
||||||
*/
|
*/
|
||||||
protected $bus = false;
|
protected $bus;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param \DateTime $dateFrom
|
* @param \DateTime $dateFrom
|
||||||
@@ -510,7 +510,7 @@ class FilterSettings implements \JsonSerializable
|
|||||||
*/
|
*/
|
||||||
public function setBus($bus)
|
public function setBus($bus)
|
||||||
{
|
{
|
||||||
$this->bus = (bool) $bus;
|
$this->bus = $bus;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -250,7 +250,7 @@ abstract class AbstractRepository extends \TYPO3\CMS\Extbase\Persistence\Reposit
|
|||||||
protected function addTransportationFilterConditions(QueryBuilder $query, FilterSettings $filterSettings)
|
protected function addTransportationFilterConditions(QueryBuilder $query, FilterSettings $filterSettings)
|
||||||
{
|
{
|
||||||
// Transportation
|
// Transportation
|
||||||
if ((bool) $filterSettings->getBus() === true) {
|
if ($filterSettings->getBus() === true) {
|
||||||
$query->andWhere('date.bus_available = 1');
|
$query->andWhere('date.bus_available = 1');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -94,7 +94,7 @@ trait RequestArgumentTypeConversionTrait
|
|||||||
$filterSettings['dateFrom'] = !empty($filterSettings['dateFrom']) ? new \DateTime($filterSettings['dateFrom']) : null;
|
$filterSettings['dateFrom'] = !empty($filterSettings['dateFrom']) ? new \DateTime($filterSettings['dateFrom']) : null;
|
||||||
$filterSettings['dateTo'] = !empty($filterSettings['dateTo']) ? new \DateTime($filterSettings['dateTo']) : null;
|
$filterSettings['dateTo'] = !empty($filterSettings['dateTo']) ? new \DateTime($filterSettings['dateTo']) : null;
|
||||||
|
|
||||||
if (!empty($filterSettings['bus'])) {
|
if ($filterSettings['bus'] !== null) {
|
||||||
$filterSettings['bus'] = (bool) $filterSettings['bus'];
|
$filterSettings['bus'] = (bool) $filterSettings['bus'];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user