From f146d88aa57ce42934bfc2c0dcf762beb3de5340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sat, 22 Feb 2025 17:48:26 +0100 Subject: [PATCH] Added additional filters to attachment datatable --- src/DataTables/Filters/AttachmentFilter.php | 6 ++++++ src/Form/Filters/AttachmentFilterType.php | 9 +++++++++ templates/attachment_list.html.twig | 2 ++ 3 files changed, 17 insertions(+) diff --git a/src/DataTables/Filters/AttachmentFilter.php b/src/DataTables/Filters/AttachmentFilter.php index 9f8cf094..d41bbe39 100644 --- a/src/DataTables/Filters/AttachmentFilter.php +++ b/src/DataTables/Filters/AttachmentFilter.php @@ -45,6 +45,9 @@ class AttachmentFilter implements FilterInterface public readonly DateTimeConstraint $lastModified; public readonly DateTimeConstraint $addedDate; + public readonly TextConstraint $originalFileName; + public readonly TextConstraint $externalLink; + public function __construct(NodesListBuilder $nodesListBuilder) { @@ -55,6 +58,9 @@ class AttachmentFilter implements FilterInterface $this->lastModified = new DateTimeConstraint('attachment.lastModified'); $this->addedDate = new DateTimeConstraint('attachment.addedDate'); $this->showInTable = new BooleanConstraint('attachment.show_in_table'); + $this->originalFileName = new TextConstraint('attachment.original_filename'); + $this->externalLink = new TextConstraint('attachment.external_path'); + } public function apply(QueryBuilder $queryBuilder): void diff --git a/src/Form/Filters/AttachmentFilterType.php b/src/Form/Filters/AttachmentFilterType.php index e6746feb..ff80bd38 100644 --- a/src/Form/Filters/AttachmentFilterType.php +++ b/src/Form/Filters/AttachmentFilterType.php @@ -100,6 +100,15 @@ class AttachmentFilterType extends AbstractType 'label' => 'attachment.edit.show_in_table' ]); + $builder->add('originalFileName', TextConstraintType::class, [ + 'label' => 'attachment.file_name' + ]); + + $builder->add('externalLink', TextConstraintType::class, [ + 'label' => 'attachment.table.external_link' + ]); + + $builder->add('lastModified', DateTimeConstraintType::class, [ 'label' => 'lastModified' ]); diff --git a/templates/attachment_list.html.twig b/templates/attachment_list.html.twig index abb6f4ad..3ff45700 100644 --- a/templates/attachment_list.html.twig +++ b/templates/attachment_list.html.twig @@ -34,6 +34,8 @@ {{ form_row(filterForm.attachmentType) }} {{ form_row(filterForm.targetType) }} {{ form_row(filterForm.showInTable) }} + {{ form_row(filterForm.originalFileName) }} + {{ form_row(filterForm.externalLink) }} {{ form_row(filterForm.lastModified) }} {{ form_row(filterForm.addedDate) }} {{ form_row(filterForm.dbId) }}