Commit 354e251e authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'release_5.2.8' of git.unicaen.fr:open-source/sygal into release_5.2.8

parents d73e4278 313953aa

CHANGELOG.md

+1 −1
Changes for CHANGELOG.md: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ Journal des modifications 
5.2.8

-----

- [FIX] Module formation : récupération du doctorant via l'utilisateur si aucun n'est fourni



- [FIX] Filtres de recherche réutilisables : nouvelle stratégie de prise en compte ou non des filtres. 



5.2.7

-----

module/Application/src/Application/Search/Filter/SearchFilter.php

+2 −6
Changes for module/Application/src/Application/Search/Filter/SearchFilter.php: 2 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ abstract class SearchFilter implements SearchFilterInterface 
     */

    public function applyToQueryBuilder(QueryBuilder $qb)

    {

        if (!$this->canApplyToQueryBuilder()) {

            return;

        }



        if ($this->applyToQueryBuilderCallable !== null) {

            $this->applyToQueryBuilderUsingCallable($qb);

            return;
@@ -182,9 +178,9 @@ abstract class SearchFilter implements SearchFilterInterface 
    /**

     * @return bool

     */

    protected function canApplyToQueryBuilder(): bool

    public function canApplyToQueryBuilder(): bool

    {

        return true;

        return (bool) $this->getValue();

    }



    /**

module/Application/src/Application/Search/Filter/SelectSearchFilter.php

+5 −0
Changes for module/Application/src/Application/Search/Filter/SelectSearchFilter.php: 5 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -91,6 +91,11 @@ class SelectSearchFilter extends SearchFilter 
        return $this->dataProvider;

    }



    public function canApplyToQueryBuilder(): bool

    {

        return $this->getValue() !== null; // '0' est une valeur valide

    }



    /**

     * Application de ce filtre au query builder spécifié, en utilisant le champ de condition.

     *

module/Application/src/Application/Search/Filter/TextSearchFilter.php

+1 −1
Changes for module/Application/src/Application/Search/Filter/TextSearchFilter.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ class TextSearchFilter extends SearchFilter 
        return $this;

    }



    protected function canApplyToQueryBuilder(): bool

    public function canApplyToQueryBuilder(): bool

    {

        $filterValue = trim($this->getValue());

module/Application/src/Application/Search/SearchService.php

+1 −1
Changes for module/Application/src/Application/Search/SearchService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -335,7 +335,7 @@ abstract class SearchService implements SearchServiceInterface 
        $qb = $this->createQueryBuilder();



        foreach ($this->filters as $filter) {

            if ($filter->getValue() !== null) {

            if ($filter->canApplyToQueryBuilder()) {

                $filter->applyToQueryBuilder($qb);

            }

        }