diff options
author | Thomas Citharel <tcit@tcit.fr> | 2016-09-25 16:11:06 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-09-25 16:11:06 +0200 |
commit | 7e98ad962680fac17b3b90ae34b9c6e5afe7636f (patch) | |
tree | 451f2c7ec7011f1f0ee8911fb1921b02f158e1dc /src/Wallabag/CoreBundle/Controller/TagController.php | |
parent | 9d7dd6b0d2480d3efff5b0ab1461f2ef99bfd57a (diff) | |
parent | 289875836a09944f5993d33753042abfef13809e (diff) | |
download | wallabag-7e98ad962680fac17b3b90ae34b9c6e5afe7636f.tar.gz wallabag-7e98ad962680fac17b3b90ae34b9c6e5afe7636f.tar.zst wallabag-7e98ad962680fac17b3b90ae34b9c6e5afe7636f.zip |
Merge pull request #2308 from wallabag/tags-duplicate
Fix duplicate tags on import
Diffstat (limited to 'src/Wallabag/CoreBundle/Controller/TagController.php')
-rw-r--r-- | src/Wallabag/CoreBundle/Controller/TagController.php | 28 |
1 files changed, 10 insertions, 18 deletions
diff --git a/src/Wallabag/CoreBundle/Controller/TagController.php b/src/Wallabag/CoreBundle/Controller/TagController.php index bc95a4d3..623a6146 100644 --- a/src/Wallabag/CoreBundle/Controller/TagController.php +++ b/src/Wallabag/CoreBundle/Controller/TagController.php | |||
@@ -84,16 +84,11 @@ class TagController extends Controller | |||
84 | { | 84 | { |
85 | $tags = $this->getDoctrine() | 85 | $tags = $this->getDoctrine() |
86 | ->getRepository('WallabagCoreBundle:Tag') | 86 | ->getRepository('WallabagCoreBundle:Tag') |
87 | ->findAllTags($this->getUser()->getId()) | 87 | ->findAllTagsWithEntries($this->getUser()->getId()); |
88 | ->getQuery() | 88 | |
89 | ->getResult(); | 89 | return $this->render('WallabagCoreBundle:Tag:tags.html.twig', [ |
90 | 90 | 'tags' => $tags, | |
91 | return $this->render( | 91 | ]); |
92 | 'WallabagCoreBundle:Tag:tags.html.twig', | ||
93 | [ | ||
94 | 'tags' => $tags, | ||
95 | ] | ||
96 | ); | ||
97 | } | 92 | } |
98 | 93 | ||
99 | /** | 94 | /** |
@@ -127,13 +122,10 @@ class TagController extends Controller | |||
127 | } | 122 | } |
128 | } | 123 | } |
129 | 124 | ||
130 | return $this->render( | 125 | return $this->render('WallabagCoreBundle:Entry:entries.html.twig', [ |
131 | 'WallabagCoreBundle:Entry:entries.html.twig', | 126 | 'form' => null, |
132 | [ | 127 | 'entries' => $entries, |
133 | 'form' => null, | 128 | 'currentPage' => $page, |
134 | 'entries' => $entries, | 129 | ]); |
135 | 'currentPage' => $page, | ||
136 | ] | ||
137 | ); | ||
138 | } | 130 | } |
139 | } | 131 | } |