aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/Wallabag/CoreBundle
diff options
context:
space:
mode:
authorNicolas LÅ“uillet <nicolas@loeuillet.org>2016-04-30 15:03:22 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2016-08-23 07:26:18 +0200
commit267e8d6361f8e7791a8687f2370a3e9d08af6648 (patch)
tree33ba4fb5e781271542bc9f7430be4d1240179f68 /src/Wallabag/CoreBundle
parent371bcca0f6b18951a15e56daae5bca2558c01851 (diff)
downloadwallabag-267e8d6361f8e7791a8687f2370a3e9d08af6648.tar.gz
wallabag-267e8d6361f8e7791a8687f2370a3e9d08af6648.tar.zst
wallabag-267e8d6361f8e7791a8687f2370a3e9d08af6648.zip
Add tests for tag list routes
Diffstat (limited to 'src/Wallabag/CoreBundle')
-rw-r--r--src/Wallabag/CoreBundle/Controller/TagController.php6
-rw-r--r--src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php7
2 files changed, 12 insertions, 1 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php
index b6514ea6..1cbc413d 100644
--- a/src/Wallabag/CoreBundle/Controller/TagController.php
+++ b/src/Wallabag/CoreBundle/Controller/TagController.php
@@ -105,7 +105,11 @@ class TagController extends Controller
105 */ 105 */
106 public function showEntriesForTagAction(Tag $tag, $page, Request $request) 106 public function showEntriesForTagAction(Tag $tag, $page, Request $request)
107 { 107 {
108 $pagerAdapter = new ArrayAdapter($tag->getEntries()->toArray()); 108 $entriesByTag = $this->getDoctrine()
109 ->getRepository('WallabagCoreBundle:Entry')
110 ->findAllByTagId($this->getUser()->getId(), $tag->getId());
111
112 $pagerAdapter = new ArrayAdapter($entriesByTag);
109 113
110 $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries') 114 $entries = $this->get('wallabag_core.helper.prepare_pager_for_entries')
111 ->prepare($pagerAdapter, $page); 115 ->prepare($pagerAdapter, $page);
diff --git a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
index 8553dced..09e99f36 100644
--- a/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
+++ b/src/Wallabag/CoreBundle/DataFixtures/ORM/LoadTagData.php
@@ -28,6 +28,13 @@ class LoadTagData extends AbstractFixture implements OrderedFixtureInterface
28 28
29 $this->addReference('bar-tag', $tag2); 29 $this->addReference('bar-tag', $tag2);
30 30
31 $tag3 = new Tag();
32 $tag3->setLabel('baz');
33
34 $manager->persist($tag3);
35
36 $this->addReference('baz-tag', $tag3);
37
31 $manager->flush(); 38 $manager->flush();
32 } 39 }
33 40