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

[FIX] Module STEP-STAR : correction du plantage en cas d'utilisation du filtre... 

[FIX] Module STEP-STAR : correction du plantage en cas d'utilisation du filtre etablissement dans la recherche de logs.
parent 68c3be42

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ Journal des modifications 
- [FIX] Bouton 'Générer l'avis de soutenance' Thèse : déplacement avant 'Feu vert' et correction des conditions d'affichage.

- [FIX] Bouton 'Générer l'avis de soutenance' HDR : déplacement avant 'Feu vert' et correction des conditions d'affichage.

- [FIX] Ajout d'un delete cascade en BDD pour supprimer les justificatifs liés à un fichier supprimé (ex: PV de soutenance).

- [FIX] Module STEP-STAR : correction du plantage en cas d'utilisation du filtre établissement dans la recherche de logs.  



10.1.1

------

composer.json

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
        "unicaen/parametre": "^6.0",

        "unicaen/pdf": "^6.1",

        "unicaen/renderer": "dev-release_7.0.6",

        "unicaen/search": "dev-master",

        "unicaen/search": "dev-release_1.1.0",

        "unicaen/sql": "dev-master",

        "unicaen/sygal-api": "dev-master",

        "unicaen/utilisateur": "^6.3"

composer.lock

+4 −4
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",

        "This file is @generated automatically"

    ],

    "content-hash": "4ecb66d7ce6529fdcdacc201260b96b5",

    "content-hash": "992f0b9f317016bb70a3ad39a0dc4b9a",

    "packages": [

        {

            "name": "apereo/phpcas",
@@ -11545,11 +11545,11 @@ 
        },

        {

            "name": "unicaen/search",

            "version": "dev-master",

            "version": "dev-release_1.1.0",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/search.git",

                "reference": "e56cc8012b57e138935ae46ab5d79476bba6a1be"

                "reference": "12f70e5005d503aa9952a615be8ee01eb11dfba3"

            },

            "require": {

                "doctrine/doctrine-orm-module": "^5.3",
@@ -11577,7 +11577,7 @@ 
                ]

            },

            "description": "Module Unicaen proposant la création de pages de recherche en BDD et de filtres normalisés",

            "time": "2025-05-07T14:53:36+00:00"

            "time": "2025-06-13T13:11:08+00:00"

        },

        {

            "name": "unicaen/shell",

module/Structure/src/Structure/Search/Etablissement/EtablissementSearchFilter.php

+3 −3
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ class EtablissementSearchFilter extends SelectSearchFilter 


    protected function applyToQueryBuilderUsingWhereFields(QueryBuilder $qb): void

    {

        Assert::maxCount($this->whereFields, 1,

        Assert::maxCount($this->whereFieldsWithoutOperator, 1,

            sprintf("La classe %s n'autorise qu'un seul 'where field'", get_class($this))

        );
@@ -29,13 +29,13 @@ class EtablissementSearchFilter extends SelectSearchFilter 
         * - spécifier le champ sur lequel doit porter le 'where' via {@see \UnicaenSearch\Filter\SearchFilter::setWhereField()}

         */

        $qb

            ->andWhere($this->whereFields[0] . " = :etab_sourceCode")

            ->andWhere($this->whereFieldsWithoutOperator[0] . " = :etab_sourceCode")

            ->setParameter('etab_sourceCode', $this->getValue());



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

            // garantit que l'étab éventuellement spécifié via $this->data est autorisé

            $sourceCodes = array_map(function(Etablissement $entity) { return $entity->getSourceCode(); }, $this->data);

            $qb->andWhere($qb->expr()->in($this->whereFields[0], $sourceCodes));

            $qb->andWhere($qb->expr()->in($this->whereFieldsWithoutOperator[0], $sourceCodes));

        }

    }

}
 
 No newline at end of file