use Pagerfanta\Adapter\ArrayAdapter;
use Pagerfanta\Exception\OutOfRangeCurrentPageException;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
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 Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
+use Wallabag\CoreBundle\Form\Type\RenameTagType;
class TagController extends Controller
{
$form = $this->createForm(NewTagType::class, new Tag());
$form->handleRequest($request);
- if ($form->isValid()) {
- $this->get('wallabag_core.content_proxy')->assignTagsToEntry(
+ if ($form->isSubmitted() && $form->isValid()) {
+ $this->get('wallabag_core.tags_assigner')->assignTagsToEntry(
$entry,
$form->get('label')->getData()
);
$entry->removeTag($tag);
$em = $this->getDoctrine()->getManager();
$em->flush();
- if (count($tag->getEntries()) == 0) {
+
+ // remove orphan tag in case no entries are associated to it
+ if (0 === \count($tag->getEntries())) {
$em->remove($tag);
+ $em->flush();
}
- $em->flush();
- $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'));
+ $redirectUrl = $this->get('wallabag_core.helper.redirect')->to($request->headers->get('referer'), '', true);
return $this->redirect($redirectUrl);
}
*/
public function showTagAction()
{
- $tags = $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Tag')
- ->findAllTags($this->getUser()->getId());
-
- return $this->render(
- 'WallabagCoreBundle:Tag:tags.html.twig',
- [
- 'tags' => $tags,
- ]
- );
+ $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,
+ ]);
}
/**
*/
public function showEntriesForTagAction(Tag $tag, $page, Request $request)
{
- $pagerAdapter = new ArrayAdapter($tag->getEntries()->toArray());
+ $entriesByTag = $this->get('wallabag_core.entry_repository')->findAllByTagId(
+ $this->getUser()->getId(),
+ $tag->getId()
+ );
+
+ $pagerAdapter = new ArrayAdapter($entriesByTag);
- $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')
- ->prepare($pagerAdapter, $page);
+ $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')->prepare($pagerAdapter);
try {
$entries->setCurrentPage($page);
}
}
- return $this->render(
- 'WallabagCoreBundle:Entry:entries.html.twig',
- [
- 'form' => null,
- 'entries' => $entries,
- 'currentPage' => $page,
- ]
+ return $this->render('WallabagCoreBundle:Entry:entries.html.twig', [
+ 'form' => null,
+ 'entries' => $entries,
+ 'currentPage' => $page,
+ '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);
}
}