class TagController extends Controller
{
/**
- * @param Request $request
- * @param Entry $entry
- *
* @Route("/new-tag/{entry}", requirements={"entry" = "\d+"}, name="new_tag")
*
* @return \Symfony\Component\HttpFoundation\Response
{
$tags = $this->get('wallabag_core.tag_repository')
->findAllFlatTagsWithNbEntries($this->getUser()->getId());
+ $nbEntriesUntagged = $this->get('wallabag_core.entry_repository')
+ ->countUntaggedEntriesByUser($this->getUser()->getId());
$renameForms = [];
foreach ($tags as $tag) {
return $this->render('WallabagCoreBundle:Tag:tags.html.twig', [
'tags' => $tags,
'renameForms' => $renameForms,
+ 'nbEntriesUntagged' => $nbEntriesUntagged,
]);
}
/**
- * @param Tag $tag
* @param int $page
*
* @Route("/tag/list/{slug}/{page}", name="tag_entries", defaults={"page" = "1"})
* Rename a given tag with a new label
* Create a new tag with the new name and drop the old one.
*
- * @param Tag $tag
- * @param Request $request
- *
* @Route("/tag/rename/{slug}", name="tag_rename")
* @ParamConverter("tag", options={"mapping": {"slug": "slug"}})
*
$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()
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->get('session')->getFlashBag()->add(
- 'notice',
- 'flashes.tag.notice.tag_renamed'
- );
+ $this->getDoctrine()->getManager()->flush();
- $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
+ $this->get('session')->getFlashBag()->add(
+ 'notice',
+ 'flashes.tag.notice.tag_renamed'
+ );
+ }
return $this->redirect($redirectUrl);
}