Remove normalization of date range in filtersettings
This commit is contained in:
@@ -278,27 +278,6 @@ class FilterService implements SingletonInterface
|
|||||||
return [$dateFrom, $dateTo];
|
return [$dateFrom, $dateTo];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* @param FilterSettings $filterSettings
|
|
||||||
*/
|
|
||||||
public function sanitizeDateRange(FilterSettings $filterSettings)
|
|
||||||
{
|
|
||||||
[ $validDateFrom, $validDateTo ] = $this->getDateRange();
|
|
||||||
$dateFrom = $filterSettings->getDateFrom();
|
|
||||||
$dateTo = $filterSettings->getDateTo();
|
|
||||||
if ($dateFrom !== null && $dateTo !== null && $dateFrom >= $dateTo) {
|
|
||||||
$dateTo = clone $dateFrom;
|
|
||||||
$dateTo->add(new \DateInterval('P14D'));
|
|
||||||
$filterSettings->setDateTo($dateTo);
|
|
||||||
}
|
|
||||||
if ($dateFrom !== null && $dateFrom < $validDateFrom) {
|
|
||||||
$filterSettings->setDateFrom($validDateFrom);
|
|
||||||
}
|
|
||||||
if ($dateTo !== null && $dateTo > $validDateTo) {
|
|
||||||
$filterSettings->setDateTo($validDateTo);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param FilterSettings $filterSettings
|
* @param FilterSettings $filterSettings
|
||||||
* @param int $conceptUid
|
* @param int $conceptUid
|
||||||
|
|||||||
@@ -121,7 +121,6 @@ trait RequestArgumentTypeConversionTrait
|
|||||||
$filterService = $objectManager->get(FilterService::class);
|
$filterService = $objectManager->get(FilterService::class);
|
||||||
|
|
||||||
$filterService->convertDestinationData($filterSettingsObject);
|
$filterService->convertDestinationData($filterSettingsObject);
|
||||||
$filterService->sanitizeDateRange($filterSettingsObject);
|
|
||||||
|
|
||||||
$this->request->setArgument('filterSettings', $filterSettingsObject);
|
$this->request->setArgument('filterSettings', $filterSettingsObject);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user