kalugin66/kimai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge main

Browse Source
This commit is contained in:
Kevin Papst
2024-09-22 20:26:03 +02:00
parent 896e8b42c1
commit 233c0e792e
5 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/API/ActivityController.php
View File

@@ -68,7 +68,7 @@ final class ActivityController extends BaseApiController
{
$query = new ActivityQuery();
$query->loadTeams();
$this->prepareBaseQuery($query, $paramFetcher);
$this->prepareQuery($query, $paramFetcher);
$order = $paramFetcher->get('order');
if (\is_string($order) && $order !== '') {

2
src/API/CustomerController.php
View File

@@ -65,7 +65,7 @@ final class CustomerController extends BaseApiController
{
$query = new CustomerQuery();
$query->loadTeams();
$this->prepareBaseQuery($query, $paramFetcher);
$this->prepareQuery($query, $paramFetcher);
$order = $paramFetcher->get('order');
if (\is_string($order) && $order !== '') {

2
src/API/ProjectController.php
View File

@@ -74,7 +74,7 @@ final class ProjectController extends BaseApiController
{
$query = new ProjectQuery();
$query->loadTeams();
$this->prepareBaseQuery($query, $paramFetcher);
$this->prepareQuery($query, $paramFetcher);
$order = $paramFetcher->get('order');
if (\is_string($order) && $order !== '') {

2
src/API/TimesheetController.php
View File

@@ -96,7 +96,7 @@ final class TimesheetController extends BaseApiController
public function cgetAction(ParamFetcherInterface $paramFetcher, CustomerRepository $customerRepository, ProjectRepository $projectRepository, ActivityRepository $activityRepository, UserRepository $userRepository): Response
{
$query = new TimesheetQuery(false);
$this->prepareBaseQuery($query, $paramFetcher);
$this->prepareQuery($query, $paramFetcher);
$seeAll = false;
if ($this->isGranted('view_other_timesheet')) {

2
src/API/UserController.php
View File

@@ -62,7 +62,7 @@ final class UserController extends BaseApiController
public function cgetAction(ParamFetcherInterface $paramFetcher): Response
{
$query = new UserQuery();
$this->prepareBaseQuery($query, $paramFetcher);
$this->prepareQuery($query, $paramFetcher);
$visible = $paramFetcher->get('visible');
if (\is_string($visible) && $visible !== '') {