devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-07 11:13:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

improve test and change method name. Also, display number of entries for each tag

Browse Source
This commit is contained in:
Thomas Citharel 2016-02-10 18:40:15 +01:00
parent 567421af50
commit e686a76d34
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Wallabag/CoreBundle/Repository/TagRepository.php
View File

@ -57,7 +57,7 @@ class TagRepository extends EntityRepository
* *
* @return Tag * @return Tag
*/ */
public function findOnebyEntryAndLabel($entry, $label) public function findOneByEntryAndTagLabel($entry, $label)
{ {
return $this->createQueryBuilder('t') return $this->createQueryBuilder('t')
->leftJoin('t.entries', 'e') ->leftJoin('t.entries', 'e')

2
src/Wallabag/CoreBundle/Resources/views/themes/material/Tag/tags.html.twig
View File

@ -9,7 +9,7 @@
<br /> <br />
<ul class="row data"> <ul class="row data">
{% for tag in tags %} {% for tag in tags %}
<li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}}</li> <li id="tag-{{ tag.id|e }}" class="col l4 m6 s12">{{tag.label}} ({{ tag.entries.getValues | length }})</li>
{% endfor %} {% endfor %}
</ul> </ul>
{% endblock %} {% endblock %}

4
src/Wallabag/CoreBundle/Tests/Controller/TagControllerTest.php
View File

@ -81,12 +81,14 @@ class TagControllerTest extends WallabagCoreTestCase
$tag = $client->getContainer() $tag = $client->getContainer()
->get('doctrine.orm.entity_manager') ->get('doctrine.orm.entity_manager')
->getRepository('WallabagCoreBundle:Tag') ->getRepository('WallabagCoreBundle:Tag')
->findOnebyEntryAndLabel($entry, $this->tagName); ->findOneByEntryAndTagLabel($entry, $this->tagName);
$client->request('GET', '/remove-tag/'.$entry->getId().'/'.$tag->getId()); $client->request('GET', '/remove-tag/'.$entry->getId().'/'.$tag->getId());
$this->assertEquals(302, $client->getResponse()->getStatusCode()); $this->assertEquals(302, $client->getResponse()->getStatusCode());
$this->assertNotContains($this->tagName, $entry->getTags());
$client->request('GET', '/remove-tag/'.$entry->getId().'/'.$tag->getId()); $client->request('GET', '/remove-tag/'.$entry->getId().'/'.$tag->getId());
$this->assertEquals(404, $client->getResponse()->getStatusCode()); $this->assertEquals(404, $client->getResponse()->getStatusCode());