From: Jérémy Benoist <j0k3r@users.noreply.github.com>
Date: Mon, 15 Oct 2018 08:32:59 +0000 (+0000)
Subject: Merge pull request #3574 from shulard/feature/rename-tags
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=e673b54f702f274a087e4feff409663d9636e57b;hp=-c;p=github%2Fwallabag%2Fwallabag.git

Merge pull request #3574 from shulard/feature/rename-tags

Allow to rename tags from the web interface.
---

e673b54f702f274a087e4feff409663d9636e57b
diff --combined src/Wallabag/CoreBundle/Controller/TagController.php
index 15f06ff5,a041510d..d0155c60
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@@ -5,12 -5,13 +5,13 @@@ namespace Wallabag\CoreBundle\Controlle
  use Pagerfanta\Adapter\ArrayAdapter;
  use Pagerfanta\Exception\OutOfRangeCurrentPageException;
  use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 -use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
  use Symfony\Bundle\FrameworkBundle\Controller\Controller;
  use Symfony\Component\HttpFoundation\Request;
 +use Symfony\Component\Routing\Annotation\Route;
  use Wallabag\CoreBundle\Entity\Entry;
  use Wallabag\CoreBundle\Entity\Tag;
  use Wallabag\CoreBundle\Form\Type\NewTagType;
+ use Wallabag\CoreBundle\Form\Type\RenameTagType;
  
  class TagController extends Controller
  {
@@@ -87,8 -88,14 +88,14 @@@
          $tags = $this->get('wallabag_core.tag_repository')
              ->findAllFlatTagsWithNbEntries($this->getUser()->getId());
  
+         $renameForms = [];
+         foreach ($tags as $tag) {
+             $renameForms[$tag['id']] = $this->createForm(RenameTagType::class, new Tag())->createView();
+         }
+ 
          return $this->render('WallabagCoreBundle:Tag:tags.html.twig', [
              'tags' => $tags,
+             'renameForms' => $renameForms,
          ]);
      }
  
@@@ -130,4 -137,48 +137,48 @@@
              'tag' => $tag,
          ]);
      }
+ 
+     /**
+      * Rename a given tag with a new label
+      * Create a new tag with the new name and drop the old one.
+      *
+      * @param Tag     $tag
+      * @param Request $request
+      *
+      * @Route("/tag/rename/{slug}", name="tag_rename")
+      * @ParamConverter("tag", options={"mapping": {"slug": "slug"}})
+      *
+      * @return \Symfony\Component\HttpFoundation\Response
+      */
+     public function renameTagAction(Tag $tag, Request $request)
+     {
+         $form = $this->createForm(RenameTagType::class, new Tag());
+         $form->handleRequest($request);
+ 
+         if ($form->isSubmitted() && $form->isValid()) {
+             $entries = $this->get('wallabag_core.entry_repository')->findAllByTagId(
+                 $this->getUser()->getId(),
+                 $tag->getId()
+             );
+             foreach ($entries as $entry) {
+                 $this->get('wallabag_core.tags_assigner')->assignTagsToEntry(
+                     $entry,
+                     $form->get('label')->getData()
+                 );
+                 $entry->removeTag($tag);
+             }
+ 
+             $em = $this->getDoctrine()->getManager();
+             $em->flush();
+         }
+ 
+         $this->get('session')->getFlashBag()->add(
+             'notice',
+             'flashes.tag.notice.tag_renamed'
+         );
+ 
+         $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
+ 
+         return $this->redirect($redirectUrl);
+     }
  }