mirror/Part-DB.Part-DB-server
1
0
Fork 1
mirror of https://github.com/Part-DB/Part-DB-server.git synced 2025-06-21 01:25:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed bug that transaction failed, when an attachment, which were used as master attachment is deleted.

Browse source
This commit is contained in:
Jan Böhmer 2023-01-24 23:47:25 +01:00
parent 6296cac962
commit 04b99cd247
1 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/EntityListeners/AttachmentDeleteListener.php
View file

@ -26,7 +26,10 @@ use App\Entity\Attachments\Attachment;
use App\Services\Attachments\AttachmentManager; use App\Services\Attachments\AttachmentManager;
use App\Services\Attachments\AttachmentPathResolver; use App\Services\Attachments\AttachmentPathResolver;
use App\Services\Attachments\AttachmentReverseSearch; use App\Services\Attachments\AttachmentReverseSearch;
use Doctrine\ORM\EntityManagerInterface;
use Doctrine\ORM\Event\LifecycleEventArgs; use Doctrine\ORM\Event\LifecycleEventArgs;
use Doctrine\ORM\Event\PostRemoveEventArgs;
use Doctrine\ORM\Event\PreRemoveEventArgs;
use Doctrine\ORM\Event\PreUpdateEventArgs; use Doctrine\ORM\Event\PreUpdateEventArgs;
use Doctrine\ORM\Mapping as ORM; use Doctrine\ORM\Mapping as ORM;
use Doctrine\ORM\Mapping\PostRemove; use Doctrine\ORM\Mapping\PostRemove;
@ -82,7 +85,7 @@ class AttachmentDeleteListener
* *
* @ORM\PreRemove() * @ORM\PreRemove()
*/ */
public function preRemoveHandler(Attachment $attachment, LifecycleEventArgs $event): void public function preRemoveHandler(Attachment $attachment, PreRemoveEventArgs $event): void
{ {
//Ensure that the attachment that will be deleted, is not used as preview picture anymore... //Ensure that the attachment that will be deleted, is not used as preview picture anymore...
$attachment_holder = $attachment->getElement(); $attachment_holder = $attachment->getElement();
@ -94,6 +97,14 @@ class AttachmentDeleteListener
//... Otherwise remove it as preview picture //... Otherwise remove it as preview picture
if ($attachment_holder->getMasterPictureAttachment() === $attachment) { if ($attachment_holder->getMasterPictureAttachment() === $attachment) {
$attachment_holder->setMasterPictureAttachment(null); $attachment_holder->setMasterPictureAttachment(null);
//Recalculate the changes on the attachment holder, so the master picture change is really written to DB
$em = $event->getObjectManager();
if (!$em instanceof EntityManagerInterface) {
throw new \RuntimeException('Invalid EntityManagerInterface!');
}
$classMetadata = $em->getClassMetadata(get_class($attachment_holder));
$em->getUnitOfWork()->computeChangeSet($classMetadata, $attachment_holder);
} }
} }
@ -102,7 +113,7 @@ class AttachmentDeleteListener
* *
* @PostRemove * @PostRemove
*/ */
public function postRemoveHandler(Attachment $attachment, LifecycleEventArgs $event): void public function postRemoveHandler(Attachment $attachment, PostRemoveEventArgs $event): void
{ {
//Dont delete file if the attachment uses a builtin ressource: //Dont delete file if the attachment uses a builtin ressource:
if ($attachment->isBuiltIn()) { if ($attachment->isBuiltIn()) {