devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 18:30:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1342 from wallabag/v2-domain-filter

Browse Source 
fix #981: add filter on domain name
This commit is contained in:
Jeremy Benoist 2015-08-19 14:33:46 +02:00
commit 7b2d336893
3 changed files with 45 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Wallabag/CoreBundle/Filter/EntryFilterType.php
View File

@ -5,6 +5,8 @@ namespace Wallabag\CoreBundle\Filter;
use Symfony\Component\Form\AbstractType;
use Symfony\Component\Form\FormBuilderInterface;
use Symfony\Component\OptionsResolver\OptionsResolver;
use Lexik\Bundle\FormFilterBundle\Filter\FilterOperands;
use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
class EntryFilterType extends AbstractType
{
@ -24,7 +26,18 @@ class EntryFilterType extends AbstractType
'placeholder' => 'dd/mm/yyyy'),
'format' => 'dd/MM/yyyy',
'widget' => 'single_text'
)));
)))
->add('domainName', 'filter_text', array(
'apply_filter' => function (QueryInterface $filterQuery, $field, $values)
{
$value = $values['value'];
if (strlen($value) <= 3 || empty($value)) {
return null;
}
$expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%'));
return $filterQuery->createCondition($expression);
}
));
}
public function getName()

8
src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/entries.html.twig
View File

@ -77,8 +77,16 @@
<label for="entry_filter_readingTime_right_number">{% trans %}to{% endtrans %}</label>
</div>
<div class="col s12">
<label>{% trans %}Create at{% endtrans %}</label>
<label>{% trans %}Domain name{% endtrans %}</label>
</div>
<div class="input-field col s6">
{{ form_widget(form.domainName, {'type': 'text'}) }}
<label for="entry_filter_domainName">{% trans %}www.website.com{% endtrans %}</label>
</div>
<div class="input-field col s6">

24
src/Wallabag/CoreBundle/Tests/Controller/EntryControllerTest.php
View File

@ -293,7 +293,6 @@ class EntryControllerTest extends WallabagCoreTestCase
{
$this->logInAs('admin');
$client = $this->getClient();
$crawler = $client->request('GET', '/config');
$form = $crawler->filter('button[id=config_save]')->form();
@ -310,4 +309,27 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertContains($parameters, $client->getResponse()->getContent());
}
public function testFilterOnDomainName()
{
$this->logInAs('admin');
$client = $this->getClient();
$crawler = $client->request('GET', '/unread/list');
$form = $crawler->filter('button[id=submit-filter]')->form();
$data = array(
'entry_filter[domainName]' => 'monde'
);
$crawler = $client->submit($form, $data);
$this->assertCount(1, $crawler->filter('div[class=entry]'));
$form = $crawler->filter('button[id=submit-filter]')->form();
$data = array(
'entry_filter[domainName]' => 'wallabag'
);
$crawler = $client->submit($form, $data);
$this->assertCount(0, $crawler->filter('div[class=entry]'));
}
}