From 39133eb796996701228501f898b4ef33af8e0fdb Mon Sep 17 00:00:00 2001 From: Kevin Decherf Date: Sat, 4 Apr 2020 21:03:22 +0200 Subject: TagController: fix duplicated tags when renaming them The fix relies on a workaround available on TagsAssigner, see the AssignTagsToEntry() signature for detail. I replaced the findOneByLabel in the corresponding test to assert that there is no duplicate. Fixes #4216 Signed-off-by: Kevin Decherf --- src/Wallabag/CoreBundle/Controller/TagController.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/Wallabag/CoreBundle/Controller') diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index a6ad131f..c228c27a 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php @@ -152,6 +152,10 @@ class TagController extends Controller $form->handleRequest($request); if ($form->isSubmitted() && $form->isValid()) { + $newTagLabel = $form->get('label')->getData(); + $newTag = new Tag(); + $newTag->setLabel($newTagLabel); + $entries = $this->get('wallabag_core.entry_repository')->findAllByTagId( $this->getUser()->getId(), $tag->getId() @@ -159,7 +163,8 @@ class TagController extends Controller foreach ($entries as $entry) { $this->get('wallabag_core.tags_assigner')->assignTagsToEntry( $entry, - $form->get('label')->getData() + $newTagLabel, + [$newTag] ); $entry->removeTag($tag); } -- cgit v1.2.3