From dae8866053c7e16baaaf0450925c927edabb9dfb Mon Sep 17 00:00:00 2001 From: Toby Batch Date: Mon, 22 Jul 2019 14:34:40 +0100 Subject: [PATCH] Fixes regexp for search timesheets by tag (#978) --- src/API/TimesheetController.php | 2 +- tests/API/TimesheetControllerTest.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/API/TimesheetController.php b/src/API/TimesheetController.php index 21d5fe71..cc159901 100644 --- a/src/API/TimesheetController.php +++ b/src/API/TimesheetController.php @@ -108,7 +108,7 @@ class TimesheetController extends BaseApiController * @Rest\QueryParam(name="activity", requirements="\d+", strict=true, nullable=true, description="Activity ID to filter timesheets") * @Rest\QueryParam(name="page", requirements="\d+", strict=true, nullable=true, description="The page to display, renders a 404 if not found (default: 1)") * @Rest\QueryParam(name="size", requirements="\d+", strict=true, nullable=true, description="The amount of entries for each page (default: 50)") - * @Rest\QueryParam(name="tags", requirements="[a-zA-Z0-9 -,]+", strict=true, nullable=true, description="The name of tags which are in the datasets") + * @Rest\QueryParam(name="tags", requirements="[a-zA-Z0-9 \-,]+", strict=true, nullable=true, description="The name of tags which are in the datasets") * @Rest\QueryParam(name="orderBy", requirements="id|begin|end|rate", strict=true, nullable=true, description="The field by which results will be ordered. Allowed values: id, begin, end, rate (default: begin)") * @Rest\QueryParam(name="order", requirements="ASC|DESC", strict=true, nullable=true, description="The result order. Allowed values: ASC, DESC (default: DESC)") * @Rest\QueryParam(name="begin", requirements=@Constraints\DateTime(format="Y-m-d\TH:i:s"), strict=true, nullable=true, description="Only records after this date will be included (format: HTML5)") diff --git a/tests/API/TimesheetControllerTest.php b/tests/API/TimesheetControllerTest.php index 4514699f..df19ab95 100644 --- a/tests/API/TimesheetControllerTest.php +++ b/tests/API/TimesheetControllerTest.php @@ -677,7 +677,7 @@ class TimesheetControllerTest extends APIControllerBaseTest $this->assertEquals(10, count($result)); $this->assertDefaultStructure($result[0], false); - $query = ['tags' => 'Nothing']; + $query = ['tags' => 'Nothing-2-see,here']; $this->assertAccessIsGranted($client, '/api/timesheets', 'GET', $query); $result = json_decode($client->getResponse()->getContent(), true);