Merge remote-tracking branch 'origin/master' into 2.4

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Controller / TagController.php

diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index 56e5195c1fc0075af5d9896416a5c9f5e5965ee3..d0155c6018bde6877786e1817a637deee6b18604 100644 (file)
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -2,17 +2,22 @@
 
 namespace Wallabag\CoreBundle\Controller;
 
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Pagerfanta\Adapter\ArrayAdapter;
+use Pagerfanta\Exception\OutOfRangeCurrentPageException;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Routing\Annotation\Route;
 use Wallabag\CoreBundle\Entity\Entry;
 use Wallabag\CoreBundle\Entity\Tag;
 use Wallabag\CoreBundle\Form\Type\NewTagType;
+use Wallabag\CoreBundle\Form\Type\RenameTagType;
 
 class TagController extends Controller
 {
     /**
      * @param Request $request
+     * @param Entry   $entry
      *
      * @Route("/new-tag/{entry}", requirements={"entry" = "\d+"}, name="new_tag")
      *
@@ -20,25 +25,17 @@ class TagController extends Controller
      */
     public function addTagFormAction(Request $request, Entry $entry)
     {
-        $tag = new Tag();
-        $form = $this->createForm(NewTagType::class, $tag);
+        $form = $this->createForm(NewTagType::class, new Tag());
         $form->handleRequest($request);
 
-        if ($form->isValid()) {
-            $existingTag = $this->getDoctrine()
-                ->getRepository('WallabagCoreBundle:Tag')
-                ->findOneByLabel($tag->getLabel());
+        if ($form->isSubmitted() && $form->isValid()) {
+            $this->get('wallabag_core.tags_assigner')->assignTagsToEntry(
+                $entry,
+                $form->get('label')->getData()
+            );
 
             $em = $this->getDoctrine()->getManager();
-
-            if (is_null($existingTag)) {
-                $entry->addTag($tag);
-                $em->persist($tag);
-            } elseif (!$existingTag->hasEntry($entry)) {
-                $entry->addTag($existingTag);
-                $em->persist($existingTag);
-            }
-
+            $em->persist($entry);
             $em->flush();
 
             $this->get('session')->getFlashBag()->add(
@@ -46,13 +43,13 @@ class TagController extends Controller
                 'flashes.tag.notice.tag_added'
             );
 
-            return $this->redirect($this->generateUrl('view', array('id' => $entry->getId())));
+            return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()]));
         }
 
-        return $this->render('WallabagCoreBundle:Tag:new_form.html.twig', array(
+        return $this->render('WallabagCoreBundle:Tag:new_form.html.twig', [
             'form' => $form->createView(),
             'entry' => $entry,
-        ));
+        ]);
     }
 
     /**
@@ -67,12 +64,16 @@ class TagController extends Controller
         $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);
     }
 
     /**
@@ -84,15 +85,100 @@ class TagController extends Controller
      */
     public function showTagAction()
     {
-        $tags = $this->getDoctrine()
-            ->getRepository('WallabagCoreBundle:Tag')
-            ->findTags($this->getUser()->getId());
-
-        return $this->render(
-            'WallabagCoreBundle:Tag:tags.html.twig',
-            array(
-                'tags' => $tags,
-            )
+        $tags = $this->get('wallabag_core.tag_repository')
+            ->findAllFlatTagsWithNbEntries($this->getUser()->getId());
+
+        $renameForms = [];
+        foreach ($tags as $tag) {
+            $renameForms[$tag['id']] = $this->createForm(RenameTagType::class, new Tag())->createView();
+        }
+
+        return $this->render('WallabagCoreBundle:Tag:tags.html.twig', [
+            'tags' => $tags,
+            'renameForms' => $renameForms,
+        ]);
+    }
+
+    /**
+     * @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,
+        ]);
+    }
+
+    /**
+     * 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"}})
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function renameTagAction(Tag $tag, Request $request)
+    {
+        $form = $this->createForm(RenameTagType::class, new Tag());
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+            $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()
+                );
+                $entry->removeTag($tag);
+            }
+
+            $em = $this->getDoctrine()->getManager();
+            $em->flush();
+        }
+
+        $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);
     }
 }