Merge pull request #1429 from wallabag/v2-language

[github/wallabag/wallabag.git] / src / Wallabag / CoreBundle / Filter / EntryFilterType.php

diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
index ff51785b8411ca733def9bdc0cdfe12b84fd902e..f40c1c2d4b568a1c8af605c57cd29382f2c4d691 100644 (file)
--- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
+++ b/src/Wallabag/CoreBundle/Filter/EntryFilterType.php
@@ -6,9 +6,26 @@ use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
+use Doctrine\ORM\EntityRepository;
+use Wallabag\CoreBundle\Entity\User;
 
 class EntryFilterType extends AbstractType
 {
+    private $user;
+    private $repository;
+
+    /**
+     * Repository & user are used to get a list of language entries for this user
+     *
+     * @param EntityRepository $entryRepository
+     * @param User             $user
+     */
+    public function __construct(EntityRepository $entryRepository, User $user)
+    {
+        $this->repository = $entryRepository;
+        $this->user = $user;
+    }
+
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
         $builder
@@ -27,21 +44,37 @@ 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'];
-                        if (strlen($value) <= 3 || empty($value)) {
+                        if (strlen($value) <= 2 || empty($value)) {
                             return;
                         }
                         $expression = $filterQuery->getExpr()->like($field, $filterQuery->getExpr()->literal('%'.$value.'%'));
 
                         return $filterQuery->createCondition($expression);
-                    },
+                },
             ))
             ->add('isArchived', 'filter_checkbox')
-            ->add('isStarred', 'filter_checkbox');
+            ->add('isStarred', 'filter_checkbox')
+            ->add('previewPicture', 'filter_checkbox', array(
+                'apply_filter' => function (QueryInterface $filterQuery, $field, $values) {
+                    if (false === $values['value']) {
+                        return;
+                    }
+
+                    $expression = $filterQuery->getExpr()->isNotNull($field);
+
+                    return $filterQuery->createCondition($expression);
+                },
+            ))
+            ->add('language', 'filter_choice', array(
+                'choices' => $this->repository->findDistinctLanguageByUser($this->user->getId()),
+            ))
+        ;
     }
 
     public function getName()