Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix newsletter adding/removing with orphan removal

Browse Source 
[MAILPOET-2900]
This commit is contained in:
Jan Jakeš
2020-05-22 21:29:59 +02:00
committed by Veljko V
parent 652f56c066
commit 70e580a93c
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Newsletter/NewsletterSaveController.php
View File

@@ -181,7 +181,7 @@ class NewsletterSaveController {
}
private function updateSegments(NewsletterEntity $newsletter, array $segments) {
$newsletter->getNewsletterSegments()->clear();
$newsletterSegments = [];
foreach ($segments as $segmentData) {
if (!is_array($segmentData) || !isset($segmentData['id'])) {
continue;
@@ -197,8 +197,21 @@ class NewsletterSaveController {
$newsletterSegment = new NewsletterSegmentEntity($newsletter, $segment);
$this->entityManager->persist($newsletterSegment);
}
$newsletter->getNewsletterSegments()->add($newsletterSegment);
if (!$newsletter->getNewsletterSegments()->contains($newsletterSegment)) {
$newsletter->getNewsletterSegments()->add($newsletterSegment);
}
$newsletterSegments[] = $newsletterSegment;
}
// on Doctrine < 2.6, when using orphan removal, we need to remove items manually instead of replacing the
// whole collection (see https://github.com/doctrine/orm/commit/1587aac4ff6b0753ddd5f8b8d4558b6b40096057)
foreach ($newsletter->getNewsletterSegments() as $newsletterSegment) {
if (!in_array($newsletterSegment, $newsletterSegments, true)) {
$newsletter->getNewsletterSegments()->removeElement($newsletterSegment); // triggers orphan removal
}
}
$this->entityManager->flush();
}