namespace Wallabag\CoreBundle\Controller;
+use Pagerfanta\Adapter\ArrayAdapter;
+use Pagerfanta\Exception\OutOfRangeCurrentPageException;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
$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 (0 === count($tag->getEntries())) {
$em->remove($tag);
+ $em->flush();
}
- $em->flush();
- return $this->redirect($request->headers->get('referer'));
+ $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
+
+ return $this->redirect($redirectUrl);
}
/**
*/
public function showTagAction()
{
- $tags = $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Tag')
- ->findTags($this->getUser()->getId());
-
- return $this->render(
- 'WallabagCoreBundle:Tag:tags.html.twig',
- [
- 'tags' => $tags,
- ]
+ $tags = $this->get('wallabag_core.tag_repository')
+ ->findAllFlatTagsWithNbEntries($this->getUser()->getId());
+
+ return $this->render('WallabagCoreBundle:Tag:tags.html.twig', [
+ 'tags' => $tags,
+ ]);
+ }
+
+ /**
+ * @param Tag $tag
+ * @param int $page
+ *
+ * @Route("/tag/list/{slug}/{page}", name="tag_entries", defaults={"page" = "1"})
+ * @ParamConverter("tag", options={"mapping": {"slug": "slug"}})
+ *
+ * @return \Symfony\Component\HttpFoundation\Response
+ */
+ public function showEntriesForTagAction(Tag $tag, $page, Request $request)
+ {
+ $entriesByTag = $this->get('wallabag_core.entry_repository')->findAllByTagId(
+ $this->getUser()->getId(),
+ $tag->getId()
);
+
+ $pagerAdapter = new ArrayAdapter($entriesByTag);
+
+ $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')->prepare($pagerAdapter);
+
+ try {
+ $entries->setCurrentPage($page);
+ } catch (OutOfRangeCurrentPageException $e) {
+ if ($page > 1) {
+ return $this->redirect($this->generateUrl($request->get('_route'), [
+ 'slug' => $tag->getSlug(),
+ 'page' => $entries->getNbPages(),
+ ]), 302);
+ }
+ }
+
+ return $this->render('WallabagCoreBundle:Entry:entries.html.twig', [
+ 'form' => null,
+ 'entries' => $entries,
+ 'currentPage' => $page,
+ 'tag' => $tag,
+ ]);
}
}