diff --git a/src/Controller/AttachmentFileController.php b/src/Controller/AttachmentFileController.php index 5ea62aeb..a03ab7e4 100644 --- a/src/Controller/AttachmentFileController.php +++ b/src/Controller/AttachmentFileController.php @@ -28,6 +28,7 @@ use App\Entity\Attachments\Attachment; use App\Form\Filters\AttachmentFilterType; use App\Services\Attachments\AttachmentManager; use App\Services\Trees\NodesListBuilder; +use App\Settings\BehaviorSettings\TableSettings; use Omines\DataTablesBundle\DataTableFactory; use RuntimeException; use Symfony\Bundle\FrameworkBundle\Controller\AbstractController; @@ -98,7 +99,8 @@ class AttachmentFileController extends AbstractController } #[Route(path: '/attachment/list', name: 'attachment_list')] - public function attachmentsTable(Request $request, DataTableFactory $dataTableFactory, NodesListBuilder $nodesListBuilder): Response + public function attachmentsTable(Request $request, DataTableFactory $dataTableFactory, NodesListBuilder $nodesListBuilder, + TableSettings $tableSettings): Response { $this->denyAccessUnlessGranted('@attachments.list_attachments'); @@ -110,7 +112,7 @@ class AttachmentFileController extends AbstractController $filterForm->handleRequest($formRequest); - $table = $dataTableFactory->createFromType(AttachmentDataTable::class, ['filter' => $filter]) + $table = $dataTableFactory->createFromType(AttachmentDataTable::class, ['filter' => $filter], ['pageLength' => $tableSettings->fullDefaultPageSize]) ->handleRequest($request); if ($table->isCallback()) { diff --git a/src/Controller/LogController.php b/src/Controller/LogController.php index a849539d..8aed44e8 100644 --- a/src/Controller/LogController.php +++ b/src/Controller/LogController.php @@ -38,6 +38,7 @@ use App\Services\LogSystem\LogEntryExtraFormatter; use App\Services\LogSystem\LogLevelHelper; use App\Services\LogSystem\LogTargetHelper; use App\Services\LogSystem\TimeTravel; +use App\Settings\BehaviorSettings\TableSettings; use Doctrine\ORM\EntityManagerInterface; use InvalidArgumentException; use Omines\DataTablesBundle\DataTableFactory; @@ -58,7 +59,7 @@ class LogController extends AbstractController } #[Route(path: '/', name: 'log_view')] - public function showLogs(Request $request, DataTableFactory $dataTable): Response + public function showLogs(Request $request, DataTableFactory $dataTable, TableSettings $tableSettings): Response { $this->denyAccessUnlessGranted('@system.show_logs'); @@ -72,7 +73,7 @@ class LogController extends AbstractController $table = $dataTable->createFromType(LogDataTable::class, [ 'filter' => $filter, - ]) + ], ['pageLength' => $tableSettings->fullDefaultPageSize]) ->handleRequest($request); if ($table->isCallback()) { diff --git a/src/Controller/PartListsController.php b/src/Controller/PartListsController.php index 677ad987..13b565bc 100644 --- a/src/Controller/PartListsController.php +++ b/src/Controller/PartListsController.php @@ -35,6 +35,7 @@ use App\Exceptions\InvalidRegexException; use App\Form\Filters\PartFilterType; use App\Services\Parts\PartsTableActionHandler; use App\Services\Trees\NodesListBuilder; +use App\Settings\BehaviorSettings\TableSettings; use Doctrine\DBAL\Exception\DriverException; use Doctrine\ORM\EntityManagerInterface; use Omines\DataTablesBundle\DataTableFactory; @@ -47,7 +48,12 @@ use Symfony\Contracts\Translation\TranslatorInterface; class PartListsController extends AbstractController { - public function __construct(private readonly EntityManagerInterface $entityManager, private readonly NodesListBuilder $nodesListBuilder, private readonly DataTableFactory $dataTableFactory, private readonly TranslatorInterface $translator) + public function __construct(private readonly EntityManagerInterface $entityManager, + private readonly NodesListBuilder $nodesListBuilder, + private readonly DataTableFactory $dataTableFactory, + private readonly TranslatorInterface $translator, + private readonly TableSettings $tableSettings + ) { } @@ -131,7 +137,7 @@ class PartListsController extends AbstractController $filterForm->handleRequest($formRequest); - $table = $this->dataTableFactory->createFromType(PartsDataTable::class, array_merge(['filter' => $filter], $additional_table_vars)) + $table = $this->dataTableFactory->createFromType(PartsDataTable::class, array_merge(['filter' => $filter], $additional_table_vars), ['pageLength' => $this->tableSettings->fullDefaultPageSize]) ->handleRequest($request); if ($table->isCallback()) { diff --git a/src/Controller/ProjectController.php b/src/Controller/ProjectController.php index 761e498c..a64c1851 100644 --- a/src/Controller/ProjectController.php +++ b/src/Controller/ProjectController.php @@ -31,6 +31,7 @@ use App\Form\ProjectSystem\ProjectBuildType; use App\Helpers\Projects\ProjectBuildRequest; use App\Services\ImportExportSystem\BOMImporter; use App\Services\ProjectSystem\ProjectBuildHelper; +use App\Settings\BehaviorSettings\TableSettings; use Doctrine\Common\Collections\ArrayCollection; use Doctrine\ORM\EntityManagerInterface; use League\Csv\SyntaxError; @@ -55,11 +56,12 @@ class ProjectController extends AbstractController } #[Route(path: '/{id}/info', name: 'project_info', requirements: ['id' => '\d+'])] - public function info(Project $project, Request $request, ProjectBuildHelper $buildHelper): Response + public function info(Project $project, Request $request, ProjectBuildHelper $buildHelper, TableSettings $tableSettings): Response { $this->denyAccessUnlessGranted('read', $project); - $table = $this->dataTableFactory->createFromType(ProjectBomEntriesDataTable::class, ['project' => $project]) + $table = $this->dataTableFactory->createFromType(ProjectBomEntriesDataTable::class, ['project' => $project], + ['pageLength' => $tableSettings->fullDefaultPageSize]) ->handleRequest($request); if ($table->isCallback()) {