aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorJeremy Benoist <jeremy.benoist@gmail.com>2015-08-22 15:35:28 +0200
committerJeremy Benoist <jeremy.benoist@gmail.com>2015-08-22 15:36:07 +0200
commit7d6c3edcdd2730a46d59c186048e76fa72e364c7 (patch)
treec115d44214f2e57509f133967ad76397b1c9a717
parentec00964de22a338d8f814c5440f8e09f542fdbbf (diff)
downloadwallabag-7d6c3edcdd2730a46d59c186048e76fa72e364c7.tar.gz
wallabag-7d6c3edcdd2730a46d59c186048e76fa72e364c7.tar.zst
wallabag-7d6c3edcdd2730a46d59c186048e76fa72e364c7.zip
Fix date filter on same day
Fix #1379
-rw-r--r--app/config/services.yml1
-rw-r--r--src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php38
-rw-r--r--src/Wallabag/CoreBundle/Filter/EntryFilterType.php5
3 files changed, 42 insertions, 2 deletions
diff --git a/app/config/services.yml b/app/config/services.yml
index af22d381..b3ec7c51 100644
--- a/app/config/services.yml
+++ b/app/config/services.yml
@@ -4,6 +4,7 @@ parameters:
4 security.authentication.provider.dao.class: Wallabag\CoreBundle\Security\Authentication\Provider\WallabagAuthenticationProvider 4 security.authentication.provider.dao.class: Wallabag\CoreBundle\Security\Authentication\Provider\WallabagAuthenticationProvider
5 security.encoder.digest.class: Wallabag\CoreBundle\Security\Authentication\Encoder\WallabagPasswordEncoder 5 security.encoder.digest.class: Wallabag\CoreBundle\Security\Authentication\Encoder\WallabagPasswordEncoder
6 security.validator.user_password.class: Wallabag\CoreBundle\Security\Validator\WallabagUserPasswordValidator 6 security.validator.user_password.class: Wallabag\CoreBundle\Security\Validator\WallabagUserPasswordValidator
7 lexik_form_filter.get_filter.doctrine_orm.class: Wallabag\CoreBundle\Event\Subscriber\CustomDoctrineORMSubscriber
7 8
8services: 9services:
9 # used for tests 10 # used for tests
diff --git a/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
new file mode 100644
index 00000000..20ced679
--- /dev/null
+++ b/src/Wallabag/CoreBundle/Event/Subscriber/CustomDoctrineORMSubscriber.php
@@ -0,0 +1,38 @@
1<?php
2
3namespace Wallabag\CoreBundle\Event\Subscriber;
4
5use Lexik\Bundle\FormFilterBundle\Event\Subscriber\DoctrineORMSubscriber;
6use Lexik\Bundle\FormFilterBundle\Event\GetFilterConditionEvent;
7use Symfony\Component\EventDispatcher\EventSubscriberInterface;
8
9/**
10 * This custom class override the default behavior of LexikFilterBundle on `filter_date_range`
11 * 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)
12 */
13class CustomDoctrineORMSubscriber extends DoctrineORMSubscriber implements EventSubscriberInterface
14{
15 /**
16 * @param GetFilterConditionEvent $event
17 */
18 public function filterDateRange(GetFilterConditionEvent $event)
19 {
20 $expr = $event->getFilterQuery()->getExpressionBuilder();
21 $values = $event->getValues();
22 $value = $values['value'];
23
24 // left date should start at midnight
25 if (isset($value['left_date'][0]) && $value['left_date'][0] instanceOf \DateTime) {
26 $value['left_date'][0]->setTime(0, 0, 0);
27 }
28
29 // right adte should end one second before midnight
30 if (isset($value['right_date'][0]) && $value['right_date'][0] instanceOf \DateTime) {
31 $value['right_date'][0]->setTime(23, 59, 59);
32 }
33
34 if (isset($value['left_date'][0]) || isset($value['right_date'][0])) {
35 $event->setCondition($expr->dateTimeInRange($event->getField(), $value['left_date'][0], $value['right_date'][0]));
36 }
37 }
38}
diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
index ff51785b..85d1a061 100644
--- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
@@ -27,8 +27,9 @@ class EntryFilterType extends AbstractType
27 ), 27 ),
28 'format' => 'dd/MM/yyyy', 28 'format' => 'dd/MM/yyyy',
29 'widget' => 'single_text', 29 'widget' => 'single_text',
30 ), 30 ),
31 )) 31 )
32 )
32 ->add('domainName', 'filter_text', array( 33 ->add('domainName', 'filter_text', array(
33 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) { 34 'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
34 $value = $values['value']; 35 $value = $values['value'];