Commit 3d315ac4 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'release_3.0.12' of git.unicaen.fr:open-source/sygal into release_3.0.12

parents 91442905 02d8c483

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Journal des modifications 
- [FIX] Vérification du dépôt de l'avis de soutenance avant notification pour rappel

- Amélioration de l'affichage des soutenances à venir

- Retrait des co-encadrants du PV de soutenances

- [FIX] Résolution du plantage lors du téléchargement d'un rapport (activité, CSI, mi-parcours)



3.0.11

-----

module/Application/src/Application/RouteMatch.php

+12 −11
Original line number Diff line number Diff line
@@ -29,23 +29,24 @@ class RouteMatch extends BaseRouteMatch 
    /**

     * @var array

     */

    private $entityClassNamesMapping;

    private $entityClassNamesMapping = [

        'these' => These::class,

        'doctorant' => Doctorant::class,

        'fichier' => Fichier::class,

        'utilisateur' => Utilisateur::class,

        'role' => Role::class,

        'ecoleDoctorale' => EcoleDoctorale::class,

        'uniteRecherche' => UniteRecherche::class,

        'etablissement' => Etablissement::class,

        'structure' => Structure::class,

        'rapport' => Rapport::class,

    ];



    /**

     * @var array

     */

    private $repositories = [];



    /**

     * @param array $entityClassNamesMapping

     * @return self

     */

    public function setEntityClassNamesMapping(array $entityClassNamesMapping): self

    {

        $this->entityClassNamesMapping = $entityClassNamesMapping;

        return $this;

    }



    /**

     * @param string $name Nom du paramètre

     * @return object|null

module/Application/src/Application/RouteMatchInjector.php

+0 −23
Original line number Diff line number Diff line
@@ -2,16 +2,6 @@ 


namespace Application;



use Application\Entity\Db\EcoleDoctorale;

use Application\Entity\Db\Etablissement;

use Application\Entity\Db\Fichier;

use Application\Entity\Db\Rapport;

use Application\Entity\Db\Role;

use Application\Entity\Db\Structure;

use Application\Entity\Db\These;

use Application\Entity\Db\UniteRecherche;

use Application\Entity\Db\Utilisateur;

use Doctorant\Entity\Db\Doctorant;

use UnicaenApp\Service\EntityManagerAwareInterface;

use UnicaenApp\Service\EntityManagerAwareTrait;

use Zend\EventManager\EventManagerInterface;
@@ -48,19 +38,6 @@ class RouteMatchInjector implements ListenerAggregateInterface, EntityManagerAwa 
        $routeMatch = new RouteMatch($e->getRouteMatch()->getParams());

        $routeMatch->setMatchedRouteName($e->getRouteMatch()->getMatchedRouteName());

        $routeMatch->setEntityManager($this->getEntityManager());

        $routeMatch->setEntityClassNamesMapping([

            'these' => These::class,

            'doctorant' => Doctorant::class,

            'fichier' => Fichier::class,

            'utilisateur' => Utilisateur::class,

            'role' => Role::class,

            'ecoleDoctorale' => EcoleDoctorale::class,

            'uniteRecherche' => UniteRecherche::class,

            'etablissement' => Etablissement::class,

            'structure' => Structure::class,

            'rapport' => Rapport::class,

        ]);





        $e->setRouteMatch($routeMatch);

    }