mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-17 03:05:19 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6629 from wallabag/fix-6330

Browse source 
Fix duplicate tags creation when assigning search results to tag
This commit is contained in:
Jérémy Benoist 2023-06-19 09:22:38 +02:00 committed by GitHub
commit 633122cfb8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/Wallabag/CoreBundle/Controller/TagController.php
View file

@ -247,11 +247,16 @@ class TagController extends AbstractController
$filter $filter
); );
$this->entityManager->persist($entry); // check to avoid duplicate tags creation
foreach ($this->entityManager->getUnitOfWork()->getScheduledEntityInsertions() as $entity) {
if ($entity instanceof Tag && strtolower($entity->getLabel()) === strtolower($filter)) {
continue 2;
}
$this->entityManager->persist($entry);
}
$this->entityManager->flush();
} }
$this->entityManager->flush();
return $this->redirect($this->redirectHelper->to($request->headers->get('referer'), '', true)); return $this->redirect($this->redirectHelper->to($request->headers->get('referer'), '', true));
} }

7
tests/Wallabag/CoreBundle/Controller/TagControllerTest.php
View file

@ -560,5 +560,12 @@ class TagControllerTest extends WallabagCoreTestCase
$this->assertContains('title', $tags); $this->assertContains('title', $tags);
} }
$tag = $client->getContainer()
->get(EntityManagerInterface::class)
->getRepository(Tag::class)
->findByLabelsAndUser(['title'], $this->getLoggedInUserId());
$this->assertCount(1, $tag);
} }
} }