groove/Part-DB-server
1
0
Fork 0
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2026-01-13 13:49:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Rebase auf Part-DB v2.1.2

Browse source
This commit is contained in:
Marcel Diegelmann 2025-09-10 13:56:36 +02:00
parent 7abc37fc9a
commit 360fed1f5e
33 changed files with 1020 additions and 162 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/DataTables/AssemblyDataTable.php
View file

@ -34,6 +34,7 @@ use App\DataTables\Helpers\ColumnSortHelper;
use App\Doctrine\Helpers\FieldHelper;
use App\Entity\AssemblySystem\Assembly;
use App\Services\EntityURLGenerator;
use App\Settings\BehaviorSettings\TableSettings;
use Doctrine\ORM\AbstractQuery;
use Doctrine\ORM\QueryBuilder;
use Omines\DataTablesBundle\Adapter\Doctrine\ORM\SearchCriteriaProvider;
@ -53,8 +54,8 @@ final class AssemblyDataTable implements DataTableTypeInterface
private readonly TranslatorInterface $translator,
private readonly AssemblyDataTableHelper $assemblyDataTableHelper,
private readonly Security $security,
private readonly string $visible_columns,
private readonly ColumnSortHelper $csh,
private readonly TableSettings $tableSettings,
) {
}
@ -139,7 +140,8 @@ final class AssemblyDataTable implements DataTableTypeInterface
]);
//Apply the user configured order and visibility and add the columns to the table
$this->csh->applyVisibilityAndConfigureColumns($dataTable, $this->visible_columns, "TABLE_ASSEMBLIES_DEFAULT_COLUMNS");
$this->csh->applyVisibilityAndConfigureColumns($dataTable, $this->tableSettings->assembliesDefaultColumns,
"TABLE_ASSEMBLIES_DEFAULT_COLUMNS");
$dataTable->addOrderBy('name')
->createAdapter(TwoStepORMAdapter::class, [