$form = $this->createForm(NewTagType::class, new Tag());
$form->handleRequest($request);
- if ($form->isValid()) {
- $this->get('wallabag_core.content_proxy')->assignTagsToEntry(
+ if ($form->isSubmitted() && $form->isValid()) {
+ $this->get('wallabag_core.tags_assigner')->assignTagsToEntry(
$entry,
$form->get('label')->getData()
);
$entry->removeTag($tag);
$em = $this->getDoctrine()->getManager();
$em->flush();
- if (count($tag->getEntries()) == 0) {
+
+ // remove orphan tag in case no entries are associated to it
+ if (count($tag->getEntries()) === 0) {
$em->remove($tag);
+ $em->flush();
}
- $em->flush();
- $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
+ $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
return $this->redirect($redirectUrl);
}
{
$tags = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Tag')
- ->findAllTags($this->getUser()->getId())
- ->getQuery()
- ->getResult();
-
- return $this->render(
- 'WallabagCoreBundle:Tag:tags.html.twig',
- [
- 'tags' => $tags,
- ]
- );
+ ->findAllTags($this->getUser()->getId());
+
+ $flatTags = [];
+
+ foreach ($tags as $tag) {
+ $nbEntries = $this->getDoctrine()
+ ->getRepository('WallabagCoreBundle:Entry')
+ ->countAllEntriesByUserIdAndTagId($this->getUser()->getId(), $tag->getId());
+
+ $flatTags[] = [
+ 'id' => $tag->getId(),
+ 'label' => $tag->getLabel(),
+ 'slug' => $tag->getSlug(),
+ 'nbEntries' => $nbEntries,
+ ];
+ }
+
+ return $this->render('WallabagCoreBundle:Tag:tags.html.twig', [
+ 'tags' => $flatTags,
+ ]);
}
/**
$pagerAdapter = new ArrayAdapter($entriesByTag);
- $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')
- ->prepare($pagerAdapter, $page);
+ $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')->prepare($pagerAdapter);
try {
$entries->setCurrentPage($page);
}
}
- return $this->render(
- 'WallabagCoreBundle:Entry:entries.html.twig',
- [
- 'form' => null,
- 'entries' => $entries,
- 'currentPage' => $page,
- ]
- );
+ return $this->render('WallabagCoreBundle:Entry:entries.html.twig', [
+ 'form' => null,
+ 'entries' => $entries,
+ 'currentPage' => $page,
+ 'tag' => $tag->getSlug(),
+ ]);
}
}