mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-06-05 23:18:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5984 from wallabag/fix/api-tags-nb-entries

Browse source 
Add `nbEntries` to the API tags list response
This commit is contained in:
Jérémy Benoist 2022-09-23 16:03:24 +02:00 committed by GitHub
commit 1a49567d0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Wallabag/ApiBundle/Controller/TagRestController.php
View file

@ -23,7 +23,7 @@ class TagRestController extends WallabagRestController
$tags = $this->getDoctrine() $tags = $this->getDoctrine()
->getRepository('WallabagCoreBundle:Tag') ->getRepository('WallabagCoreBundle:Tag')
->findAllTags($this->getUser()->getId()); ->findAllFlatTagsWithNbEntries($this->getUser()->getId());
$json = $this->get('jms_serializer')->serialize($tags, 'json'); $json = $this->get('jms_serializer')->serialize($tags, 'json');

4
src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
View file

@ -33,8 +33,4 @@
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
<div>
</div>
{% endblock %} {% endblock %}

3
tests/Wallabag/ApiBundle/Controller/TagRestControllerTest.php
View file

@ -20,14 +20,13 @@ class TagRestControllerTest extends WallabagApiTestCase
$this->assertGreaterThan(0, $content); $this->assertGreaterThan(0, $content);
$this->assertArrayHasKey('id', $content[0]); $this->assertArrayHasKey('id', $content[0]);
$this->assertArrayHasKey('label', $content[0]); $this->assertArrayHasKey('label', $content[0]);
$this->assertArrayHasKey('nbEntries', $content[0]);
$tagLabels = array_map(function ($i) { $tagLabels = array_map(function ($i) {
return $i['label']; return $i['label'];
}, $content); }, $content);
$this->assertNotContains($this->otherUserTagLabel, $tagLabels, 'There is a possible tag leak'); $this->assertNotContains($this->otherUserTagLabel, $tagLabels, 'There is a possible tag leak');
return end($content);
} }
public function testDeleteUserTag() public function testDeleteUserTag()