$form = $this->createForm(RenameTagType::class, new Tag());
$form->handleRequest($request);
- if ($form->isSubmitted()
- && $form->isValid()
- && $form->get('label')->getData() !== $tag->getLabel()
- ) {
- $newTagLabel = $form->get('label')->getData();
+ $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
+
+ if ($form->isSubmitted() && $form->isValid()) {
$newTag = new Tag();
- $newTag->setLabel($newTagLabel);
+ $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(),
foreach ($entries as $entry) {
$this->get('wallabag_core.tags_assigner')->assignTagsToEntry(
$entry,
- $newTagLabel,
+ $newTag->getLabel(),
[$newTag]
);
$entry->removeTag($tag);
}
- $em = $this->getDoctrine()->getManager();
- $em->flush();
+ $this->getDoctrine()->getManager()->flush();
$this->get('session')->getFlashBag()->add(
'notice',
);
}
- $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
-
return $this->redirect($redirectUrl);
}
}