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

added new permission to separate time and money budget (#3352)

Browse Source
This commit is contained in:
Kevin Papst
2022-06-11 12:23:02 +02:00
committed by GitHub
parent 3f827b3104
commit b46fdcefad
47 changed files with 853 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/API/ActivityController.php
View File

@@ -212,6 +212,7 @@ class ActivityController extends BaseApiController
$form = $this->createForm(ActivityApiEditForm::class, $activity, [
'include_budget' => $this->isGranted('budget', $activity),
'include_time' => $this->isGranted('time', $activity),
]);
$form->submit($request->request->all());
@@ -276,6 +277,7 @@ class ActivityController extends BaseApiController
$form = $this->createForm(ActivityApiEditForm::class, $activity, [
'include_budget' => $this->isGranted('budget', $activity),
'include_time' => $this->isGranted('time', $activity),
]);
$form->setData($activity);

2
src/API/CustomerController.php
View File

@@ -182,6 +182,7 @@ class CustomerController extends BaseApiController
$form = $this->createForm(CustomerApiEditForm::class, $customer, [
'include_budget' => $this->isGranted('budget', $customer),
'include_time' => $this->isGranted('time', $customer),
]);
$form->submit($request->request->all());
@@ -246,6 +247,7 @@ class CustomerController extends BaseApiController
$form = $this->createForm(CustomerApiEditForm::class, $customer, [
'include_budget' => $this->isGranted('budget', $customer),
'include_time' => $this->isGranted('time', $customer),
]);
$form->setData($customer);

2
src/API/ProjectController.php
View File

@@ -226,6 +226,7 @@ class ProjectController extends BaseApiController
'timezone' => $this->getDateTimeFactory()->getTimezone()->getName(),
'date_format' => self::DATE_FORMAT,
'include_budget' => $this->isGranted('budget', $project),
'include_time' => $this->isGranted('time', $project),
]);
$form->submit($request->request->all());
@@ -292,6 +293,7 @@ class ProjectController extends BaseApiController
'timezone' => $this->getDateTimeFactory()->getTimezone()->getName(),
'date_format' => self::DATE_FORMAT,
'include_budget' => $this->isGranted('budget', $project),
'include_time' => $this->isGranted('time', $project),
]);
$form->setData($project);