Commit a25f8e61 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release-1.1.5' into test

parents 46ef0c79 084edd5e
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -108,12 +108,12 @@ class TheseSelectFilter extends TheseFilter
            case self::NAME_anneeUniv1ereInscription:
                if ($filterValue === 'NULL') {
                    $qb
                        ->leftJoin('t.anneesUnivInscription', 'aui')
                        ->andWhere('aui.anneeUniv IS NULL');
                        ->leftJoin('t.anneesUniv1ereInscription', 'aui1')
                        ->andWhere('aui1.anneeUniv IS NULL');
                } else {
                    $qb
                        ->join('t.anneesUnivInscription', 'aui')
                        ->andWhere('aui.anneeUniv = :anneeUniv1ereInscription')
                        ->join('t.anneesUniv1ereInscription', 'aui1')
                        ->andWhere('aui1.anneeUniv = :anneeUniv1ereInscription')
                        ->setParameter('anneeUniv1ereInscription', $filterValue);
                }
                break;