Merge branch 'issue719_filter_activities_version_2' into testing

This commit is contained in:
Julien Fastré 2023-07-11 17:02:44 +02:00
commit a333a0312a
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB

View File

@ -259,7 +259,7 @@ final class ActivityController extends AbstractController
$filterArgs = [
'my_activities' => $filter->getSingleCheckboxData('my_activities'),
'types' => $filter->hasEntityChoice('activity_type') ? $filter->getEntityChoiceData('activity_types') : [],
'types' => $filter->hasEntityChoice('activity_types') ? $filter->getEntityChoiceData('activity_types') : [],
'jobs' => $filter->hasEntityChoice('jobs') ? $filter->getEntityChoiceData('jobs') : [],
'before' => $filter->getDateRangeData('activity_date')['to'],
'after' => $filter->getDateRangeData('activity_date')['from'],