X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FTagController.php;h=8645fb442621b933a10df0d127c5919b4cecd3d6;hb=97c8eb3c2398d0aaf06155de5e0828e4020cb5d4;hp=e448cea1ebd181be873e1c2f6ca1e6e20794f7fb;hpb=f48a0189290ae6dbdb0412a3abd95acd257e55cd;p=github%2Fwallabag%2Fwallabag.git

diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index e448cea1..8645fb44 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -4,9 +4,72 @@ namespace Wallabag\CoreBundle\Controller;
 
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
 use Symfony\Bundle\FrameworkBundle\Controller\Controller;
+use Symfony\Component\HttpFoundation\Request;
+use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\CoreBundle\Form\Type\NewTagType;
 
 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
+     */
+    public function addTagFormAction(Request $request, Entry $entry)
+    {
+        $form = $this->createForm(NewTagType::class, new Tag());
+        $form->handleRequest($request);
+
+        if ($form->isValid()) {
+            $this->get('wallabag_core.content_proxy')->assignTagsToEntry(
+                $entry,
+                $form->get('label')->getData()
+            );
+
+            $em = $this->getDoctrine()->getManager();
+            $em->persist($entry);
+            $em->flush();
+
+            $this->get('session')->getFlashBag()->add(
+                'notice',
+                'flashes.tag.notice.tag_added'
+            );
+
+            return $this->redirect($this->generateUrl('view', ['id' => $entry->getId()]));
+        }
+
+        return $this->render('WallabagCoreBundle:Tag:new_form.html.twig', [
+            'form' => $form->createView(),
+            'entry' => $entry,
+        ]);
+    }
+
+    /**
+     * Removes tag from entry.
+     *
+     * @Route("/remove-tag/{entry}/{tag}", requirements={"entry" = "\d+", "tag" = "\d+"}, name="remove_tag")
+     *
+     * @return \Symfony\Component\HttpFoundation\Response
+     */
+    public function removeTagFromEntry(Request $request, Entry $entry, Tag $tag)
+    {
+        $entry->removeTag($tag);
+        $em = $this->getDoctrine()->getManager();
+        $em->flush();
+        if (count($tag->getEntries()) == 0) {
+            $em->remove($tag);
+        }
+        $em->flush();
+
+        $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
+
+        return $this->redirect($redirectUrl);
+    }
+
     /**
      * Shows tags for current user.
      *
@@ -18,14 +81,13 @@ class TagController extends Controller
     {
         $tags = $this->getDoctrine()
             ->getRepository('WallabagCoreBundle:Tag')
-            ->findTags($this->getUser()->getId());
+            ->findAllTags($this->getUser()->getId());
 
         return $this->render(
             'WallabagCoreBundle:Tag:tags.html.twig',
-            array(
-                'tags'       => $tags
-            )
+            [
+                'tags' => $tags,
+            ]
         );
     }
-
 }