From 6d90c5c3d91f899da45d07aea4f73b7c4a133577 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Fromme?= Date: Wed, 25 Oct 2023 16:03:13 +0200 Subject: [PATCH] Fix: Adopt current document status in form --- src/Controller/Admin/Document/CheckController.php | 5 ++++- src/Model/DocumentCheckDto.php | 3 ++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/Controller/Admin/Document/CheckController.php b/src/Controller/Admin/Document/CheckController.php index 3e127f1..0e8c3f8 100644 --- a/src/Controller/Admin/Document/CheckController.php +++ b/src/Controller/Admin/Document/CheckController.php @@ -61,7 +61,10 @@ class CheckController extends AbstractController $this->rejectDocument($document, $formData->getComment()); $this->eventDispatcher->dispatch(new DocumentRejectedEvent($formData), DocumentRejectedEvent::NAME); default: - $document->setStatus($formData->getStatus()); + $document + ->setStatus($formData->getStatus()) + ->setComment($formData->getComment()) + ; $this->entityManager->flush(); $this->addFlash('success', 'Der Status wurde aktualisiert'); $this->logger->info('Update document status', [ diff --git a/src/Model/DocumentCheckDto.php b/src/Model/DocumentCheckDto.php index 1db3fe7..600f5d7 100644 --- a/src/Model/DocumentCheckDto.php +++ b/src/Model/DocumentCheckDto.php @@ -8,11 +8,12 @@ class DocumentCheckDto { private Upload $upload; private ?string $status = null; - private ?string $comment = null; + private ?string $comment; public function __construct(Upload $upload) { $this->upload = $upload; + $this->comment = $upload->getComment(); } public function getUpload(): Upload