use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\Request;
-use Wallabag\CoreBundle\Form\Type\NewTagType;
-use Wallabag\CoreBundle\Entity\Tag;
use Wallabag\CoreBundle\Entity\Entry;
+use Wallabag\CoreBundle\Entity\Tag;
+use Wallabag\CoreBundle\Form\Type\NewTagType;
class TagController extends Controller
{
*/
public function addTagFormAction(Request $request, Entry $entry)
{
- $tag = new Tag($this->getUser());
- $form = $this->createForm(new NewTagType(), $tag);
+ $tag = new Tag();
+ $form = $this->createForm(NewTagType::class, $tag);
$form->handleRequest($request);
if ($form->isValid()) {
$existingTag = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Tag')
- ->findOneByLabelAndUserId($tag->getLabel(), $this->getUser()->getId());
+ ->findOneByLabel($tag->getLabel());
$em = $this->getDoctrine()->getManager();
if (is_null($existingTag)) {
$entry->addTag($tag);
$em->persist($tag);
- } else {
- if (!$existingTag->hasEntry($entry)) {
- $entry->addTag($existingTag);
- $em->persist($existingTag);
- }
+ } elseif (!$existingTag->hasEntry($entry)) {
+ $entry->addTag($existingTag);
+ $em->persist($existingTag);
}
$em->flush();
));
}
+ /**
+ * 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.
*