X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=src%2FWallabag%2FCoreBundle%2FController%2FTagController.php;h=ff4d64a8f4319653961310bbf5ba46d75a30c419;hb=3080a4afa46a1d19c2f65c4fb321b1f4e2c38dc0;hp=89284231579cd29563e0809f61e5be8bc517e6bd;hpb=3f3fbef11f86968a991426c2a052ad42e0c16d44;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index 89284231..ff4d64a8 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php @@ -5,10 +5,56 @@ 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 + * + * @Route("/new-tag/{entry}", requirements={"entry" = "\d+"}, name="new_tag") + * + * @return \Symfony\Component\HttpFoundation\Response + */ + public function addTagFormAction(Request $request, Entry $entry) + { + $tag = new Tag(); + $form = $this->createForm(NewTagType::class, $tag); + $form->handleRequest($request); + + if ($form->isValid()) { + $existingTag = $this->getDoctrine() + ->getRepository('WallabagCoreBundle:Tag') + ->findOneByLabel($tag->getLabel()); + + $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->flush(); + + $this->get('session')->getFlashBag()->add( + 'notice', + 'Tag added' + ); + + return $this->redirect($this->generateUrl('view', array('id' => $entry->getId()))); + } + + return $this->render('WallabagCoreBundle:Tag:new_form.html.twig', array( + 'form' => $form->createView(), + 'entry' => $entry, + )); + } + /** * Shows tags for current user. * @@ -25,9 +71,8 @@ class TagController extends Controller return $this->render( 'WallabagCoreBundle:Tag:tags.html.twig', array( - 'tags' => $tags + 'tags' => $tags, ) ); } - }