X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=src%2FWallabag%2FCoreBundle%2FController%2FTagController.php;h=1a1f8c3d3b15233fda2ae92874a7a7f5c22d9b41;hb=dd4997d705adb066dfbbe0f4dd96d56f1e8bc475;hp=e448cea1ebd181be873e1c2f6ca1e6e20794f7fb;hpb=d0b90fbe18da72dc09a0ef748fa178314f6657b6;p=github%2Fwallabag%2Fwallabag.git diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index e448cea1..1a1f8c3d 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php @@ -4,9 +4,69 @@ 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) + { + $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', array('id' => $entry->getId()))); + } + + return $this->render('WallabagCoreBundle:Tag:new_form.html.twig', array( + '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(); + + return $this->redirect($request->headers->get('referer')); + } + /** * Shows tags for current user. * @@ -23,9 +83,8 @@ class TagController extends Controller return $this->render( 'WallabagCoreBundle:Tag:tags.html.twig', array( - 'tags' => $tags + 'tags' => $tags, ) ); } - }