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

Merge pull request #1393 from wallabag/fix-filter-same-day

Browse Source 
Fix date filter on same day
This commit is contained in:
Nicolas Lœuillet 2015-08-24 10:39:24 +02:00
commit 8bb1f3d69a
4 changed files with 51 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/config/services.yml
View File

@ -4,6 +4,7 @@ parameters:
security.authentication.provider.dao.class: Wallabag\CoreBundle\Security\Authentication\Provider\WallabagAuthenticationProvider
security.encoder.digest.class: Wallabag\CoreBundle\Security\Authentication\Encoder\WallabagPasswordEncoder
security.validator.user_password.class: Wallabag\CoreBundle\Security\Validator\WallabagUserPasswordValidator
lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
services:
# used for tests

38
src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php Normal file
View File

@ -0,0 +1,38 @@
<?php
namespace Wallabag\CoreBundle\Event\Subscriber;
use Lexik\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;
use Lexik\Bundle\FormFilterBundle\Event\GetFilterConditionEvent;
use Symfony\Component\EventDispatcher\EventSubscriberInterface;
/**
* This custom class override the default behavior of LexikFilterBundle on `filter_date_range`
* It converts a date_range to date_time_range to add hour to be able to grab a whole day (from 00:00:00 to 23:59:59).
*/
class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface
{
/**
* @param GetFilterConditionEvent $event
*/
public function filterDateRange(GetFilterConditionEvent $event)
{
$expr = $event->getFilterQuery()->getExpressionBuilder();
$values = $event->getValues();
$value = $values['value'];
// left date should start at midnight
if (isset($value['left_date'][0]) && $value['left_date'][0] instanceof \DateTime) {
$value['left_date'][0]->setTime(0, 0, 0);
}
// right adte should end one second before midnight
if (isset($value['right_date'][0]) && $value['right_date'][0] instanceof \DateTime) {
$value['right_date'][0]->setTime(23, 59, 59);
}
if (isset($value['left_date'][0]) || isset($value['right_date'][0])) {
$event->setCondition($expr->dateTimeInRange($event->getField(), $value['left_date'][0], $value['right_date'][0]));
}
}
}

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

@ -27,8 +27,9 @@ class EntryFilterType extends AbstractType
),
'format' => 'dd/MM/yyyy',
'widget' => 'single_text',
),
))
),
)
)
->add('domainName', 'filter_text', array(
'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
$value = $values['value'];

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

@ -278,6 +278,15 @@ class EntryControllerTest extends WallabagCoreTestCase
$this->assertCount(5, $crawler->filter('div[class=entry]'));
$data = array(
'entry_filter[createdAt][left_date]' => date('d/m/Y'),
'entry_filter[createdAt][right_date]' => date('d/m/Y'),
);
$crawler = $client->submit($form, $data);
$this->assertCount(5, $crawler->filter('div[class=entry]'));
$data = array(
'entry_filter[createdAt][left_date]' => '01/01/1970',
'entry_filter[createdAt][right_date]' => '01/01/1970',