oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-01 17:38:38 +00:00
Code Wiki Activity

Merge pull request #4310 from wallabag/fix/4216

Browse source 
TagController: fix duplicated tags when renaming them
This commit is contained in:
Kevin Decherf 2020-04-20 18:02:31 +02:00 • committed by GitHub
commit 2ca2ed39fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 239 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -151,7 +151,22 @@ class TagController extends Controller
$form = $this->createForm(RenameTagType::class, new Tag());
$form->handleRequest($request);
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
if ($form->isSubmitted() && $form->isValid()) {
$newTag = new Tag();
$newTag->setLabel($form->get('label')->getData());
if ($newTag->getLabel() === $tag->getLabel()) {
return $this->redirect($redirectUrl);
}
$tagFromRepo = $this->get('wallabag_core.tag_repository')->findOneByLabel($newTag->getLabel());
if (null !== $tagFromRepo) {
$newTag = $tagFromRepo;
}
$entries = $this->get('wallabag_core.entry_repository')->findAllByTagId(
$this->getUser()->getId(),
$tag->getId()
@ -159,22 +174,20 @@ class TagController extends Controller
foreach ($entries as $entry) {
$this->get('wallabag_core.tags_assigner')->assignTagsToEntry(
$entry,
$form->get('label')->getData()
$newTag->getLabel(),
[$newTag]
);
$entry->removeTag($tag);
}
$em = $this->getDoctrine()->getManager();
$em->flush();
$this->getDoctrine()->getManager()->flush();
$this->get('session')->getFlashBag()->add(
'notice',
'flashes.tag.notice.tag_renamed'
);
}
$this->get('session')->getFlashBag()->add(
'notice',
'flashes.tag.notice.tag_renamed'
);
$redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
return $this->redirect($redirectUrl);
}
}