Simplify tag creation from entry

[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 f31f4028c217b0d9ba05862b8bcc7177b82dee5f..1a1f8c3d3b15233fda2ae92874a7a7f5c22d9b41 100644 (file)
--- 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(