From c07979e3a937d8b9b7a6243cc7c0c2b5d3a2fa47 Mon Sep 17 00:00:00 2001 From: Maarten Becker Date: Fri, 10 Jan 2025 10:02:14 +0100 Subject: [PATCH] fix usage of activity api globals parameter (#5284) --- src/API/ActivityController.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/API/ActivityController.php b/src/API/ActivityController.php index 82f7b9e1..37057faf 100644 --- a/src/API/ActivityController.php +++ b/src/API/ActivityController.php @@ -60,7 +60,7 @@ final class ActivityController extends BaseApiController #[Rest\QueryParam(name: 'project', requirements: '\d+', strict: true, nullable: true, description: 'Project ID to filter activities')] #[Rest\QueryParam(name: 'projects', map: true, requirements: '\d+', strict: true, nullable: true, default: [], description: 'List of project IDs to filter activities, e.g.: projects[]=1&projects[]=2')] #[Rest\QueryParam(name: 'visible', requirements: '1|2|3', default: 1, strict: true, nullable: true, description: 'Visibility status to filter activities: 1=visible, 2=hidden, 3=all')] - #[Rest\QueryParam(name: 'globals', strict: true, nullable: true, description: 'Use if you want to fetch only global activities. Allowed values: true (default: false)')] + #[Rest\QueryParam(name: 'globals', requirements: '0|1|true|false', strict: true, nullable: true, description: 'Use if you want to fetch only global activities. Allowed values: 0|1 (default: 0 for false)')] #[Rest\QueryParam(name: 'orderBy', requirements: 'id|name|project', strict: true, nullable: true, description: 'The field by which results will be ordered. Allowed values: id, name, project (default: name)')] #[Rest\QueryParam(name: 'order', requirements: 'ASC|DESC', strict: true, nullable: true, description: 'The result order. Allowed values: ASC, DESC (default: ASC)')] #[Rest\QueryParam(name: 'term', description: 'Free search term')] @@ -83,7 +83,8 @@ final class ActivityController extends BaseApiController $query->setOrderBy($orderBy); } - if (null !== $paramFetcher->get('globals')) { + $globals = $paramFetcher->get('globals'); + if (\is_string($globals) && ($globals === 'true' || $globals === '1')) { $query->setGlobalsOnly(true); }