jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Release 2.43 (#5694)

Browse Source
This commit is contained in:
Kevin Papst
2025-11-14 17:41:33 +01:00
committed by GitHub
parent 8e6764b67a
commit 8a42c9640f
22 changed files with 319 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/API/ActivityController.php
View File

@@ -36,7 +36,6 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
final class ActivityController extends BaseApiController
{
public const GROUPS_ENTITY = ['Default', 'Entity', 'Activity', 'Activity_Entity'];
public const GROUPS_FORM = ['Default', 'Entity', 'Activity'];
public const GROUPS_COLLECTION = ['Default', 'Collection', 'Activity'];
public const GROUPS_RATE = ['Default', 'Entity', 'Activity_Rate'];
@@ -130,8 +129,7 @@ final class ActivityController extends BaseApiController
throw $this->createAccessDeniedException('User cannot create activities');
}
$activity = new Activity();
$this->activityService->loadMetaFields($activity);
$activity = $this->activityService->createNewActivity();
$form = $this->createForm(ActivityApiEditForm::class, $activity, [
'include_budget' => $this->isGranted('budget', $activity),
@@ -150,7 +148,7 @@ final class ActivityController extends BaseApiController
}
$view = new View($form);
$view->getContext()->setGroups(self::GROUPS_FORM);
$view->getContext()->setGroups(self::GROUPS_ENTITY);
return $this->viewHandler->handle($view);
}
@@ -177,7 +175,7 @@ final class ActivityController extends BaseApiController
if (false === $form->isValid()) {
$view = new View($form, Response::HTTP_OK);
$view->getContext()->setGroups(self::GROUPS_FORM);
$view->getContext()->setGroups(self::GROUPS_ENTITY);
return $this->viewHandler->handle($view);
}

5
src/API/CustomerController.php
View File

@@ -36,7 +36,6 @@ use Symfony\Component\Security\Http\Attribute\IsGranted;
final class CustomerController extends BaseApiController
{
public const GROUPS_ENTITY = ['Default', 'Entity', 'Customer', 'Customer_Entity'];
public const GROUPS_FORM = ['Default', 'Entity', 'Customer'];
public const GROUPS_COLLECTION = ['Default', 'Collection', 'Customer'];
public const GROUPS_RATE = ['Default', 'Entity', 'Customer_Rate'];
@@ -139,7 +138,7 @@ final class CustomerController extends BaseApiController
}
$view = new View($form);
$view->getContext()->setGroups(self::GROUPS_FORM);
$view->getContext()->setGroups(self::GROUPS_ENTITY);
return $this->viewHandler->handle($view);
}
@@ -166,7 +165,7 @@ final class CustomerController extends BaseApiController
if (false === $form->isValid()) {
$view = new View($form, Response::HTTP_OK);
$view->getContext()->setGroups(self::GROUPS_FORM);
$view->getContext()->setGroups(self::GROUPS_ENTITY);
return $this->viewHandler->handle($view);
}

5
src/API/ProjectController.php
View File

@@ -38,7 +38,6 @@ use Symfony\Component\Validator\Constraints;
final class ProjectController extends BaseApiController
{
public const GROUPS_ENTITY = ['Default', 'Entity', 'Project', 'Project_Entity'];
public const GROUPS_FORM = ['Default', 'Entity', 'Project'];
public const GROUPS_COLLECTION = ['Default', 'Collection', 'Project'];
public const GROUPS_RATE = ['Default', 'Entity', 'Project_Rate'];
@@ -194,7 +193,7 @@ final class ProjectController extends BaseApiController
}
$view = new View($form);
$view->getContext()->setGroups(self::GROUPS_FORM);
$view->getContext()->setGroups(self::GROUPS_ENTITY);
return $this->viewHandler->handle($view);
}
@@ -223,7 +222,7 @@ final class ProjectController extends BaseApiController
if (false === $form->isValid()) {
$view = new View($form, Response::HTTP_OK);
$view->getContext()->setGroups(self::GROUPS_FORM);
$view->getContext()->setGroups(self::GROUPS_ENTITY);
return $this->viewHandler->handle($view);
}