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

Release 2.41 (#5653)

Browse Source
This commit is contained in:
Kevin Papst
2025-11-08 23:03:44 +01:00
committed by GitHub
parent 636a51e721
commit 1a38c7d7a3
57 changed files with 705 additions and 409 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Controller/CustomerController.php
View File

@@ -35,6 +35,7 @@ use App\Repository\Query\CustomerQuery;
use App\Repository\Query\ProjectQuery;
use App\Repository\Query\TeamQuery;
use App\Repository\Query\TimesheetQuery;
use App\Repository\Query\VisibilityInterface;
use App\Repository\TeamRepository;
use App\Utils\DataTable;
use App\Utils\PageSetup;
@@ -146,7 +147,7 @@ final class CustomerController extends AbstractController
{
$customer = $customerService->createNewCustomer('');
return $this->renderCustomerForm($customer, $request, true);
return $this->renderCustomerForm($customer, $request, true, $customerService);
}
#[Route(path: '/{id}/permissions', name: 'admin_customer_permissions', methods: ['GET', 'POST'])]
@@ -281,7 +282,7 @@ final class CustomerController extends AbstractController
$query->setPage($page);
$query->setPageSize(5);
$query->addCustomer($customer);
$query->setShowBoth();
$query->setVisibility(VisibilityInterface::SHOW_BOTH);
$query->addOrderGroup('visible', ProjectQuery::ORDER_DESC);
$query->addOrderGroup('name', ProjectQuery::ORDER_ASC);
@@ -421,9 +422,9 @@ final class CustomerController extends AbstractController
#[Route(path: '/{id}/edit', name: 'admin_customer_edit', methods: ['GET', 'POST'])]
#[IsGranted('edit', 'customer')]
public function editAction(Customer $customer, Request $request): Response
public function editAction(Customer $customer, Request $request, CustomerService $customerService): Response
{
return $this->renderCustomerForm($customer, $request);
return $this->renderCustomerForm($customer, $request, false, $customerService);
}
#[Route(path: '/{id}/delete', name: 'admin_customer_delete', methods: ['GET', 'POST'])]
@@ -496,7 +497,7 @@ final class CustomerController extends AbstractController
return $writer->getFileResponse($spreadsheet);
}
private function renderCustomerForm(Customer $customer, Request $request, bool $create = false): Response
private function renderCustomerForm(Customer $customer, Request $request, bool $create, CustomerService $customerService): Response
{
$editForm = $this->createEditForm($customer);
@@ -504,7 +505,7 @@ final class CustomerController extends AbstractController
if ($editForm->isSubmitted() && $editForm->isValid()) {
try {
$this->repository->saveCustomer($customer);
$customerService->saveCustomer($customer);
$this->flashSuccess('action.update.success');
if ($create) {