From 2baca964f38e658f60c8b9f81a9db289ba85bd0d Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 27 Mar 2016 17:09:33 +0200 Subject: Simplify tag creation from entry Testing that a tag exist or is assigned to the current entry isn't important in the tag controler since the `assignTagsToEntry` is already doing that job. So it simplify the controller. --- .../CoreBundle/Controller/TagController.php | 26 +++++----------------- 1 file changed, 6 insertions(+), 20 deletions(-) (limited to 'src/Wallabag/CoreBundle/Controller') diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index f31f4028..1a1f8c3d 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php @@ -20,31 +20,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()); + $this->get('wallabag_core.content_proxy')->assignTagsToEntry( + $entry, + $form->get('label')->getData() + ); $em = $this->getDoctrine()->getManager(); - - if (is_null($existingTag)) { - $this->get('wallabag_core.content_proxy')->assignTagsToEntry( - $entry, - $tag - ); - $em->persist($tag); - } elseif (!$existingTag->hasEntry($entry)) { - $this->get('wallabag_core.content_proxy')->assignTagsToEntry( - $entry, - $existingTag - ); - $em->persist($existingTag); - } - + $em->persist($entry); $em->flush(); $this->get('session')->getFlashBag()->add( -- cgit v1.2.3