Commit 82d80885 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Historisation et dehistorisation de la structure associé à une structure concrete

parent d98bac0a
Loading
Loading
Loading
Loading
+2 −0
Changes for module/Application/src/Application/Service/EcoleDoctorale/EcoleDoctoraleService.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -56,6 +56,7 @@ class EcoleDoctoraleService extends BaseService implements RoleServiceAwareInter
    public function deleteSoftly(EcoleDoctorale $ecole, Utilisateur $destructeur)
    {
        $ecole->historiser($destructeur);
        $ecole->getStructure()->historiser($destructeur);

        $this->flush($ecole);
    }
@@ -63,6 +64,7 @@ class EcoleDoctoraleService extends BaseService implements RoleServiceAwareInter
    public function undelete(EcoleDoctorale $ecole)
    {
        $ecole->dehistoriser();
        $ecole->getStructure()->dehistoriser();

        $this->flush($ecole);
    }
+2 −0
Changes for module/Application/src/Application/Service/Etablissement/EtablissementService.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ class EtablissementService extends BaseService
    public function deleteSoftly(Etablissement $etablissement, Utilisateur $destructeur)
    {
        $etablissement->historiser($destructeur);
        $etablissement->getStructure()->historiser($destructeur);

        $this->flush($etablissement);
    }
@@ -61,6 +62,7 @@ class EtablissementService extends BaseService
    public function undelete(Etablissement $etablissement)
    {
        $etablissement->dehistoriser();
        $etablissement->getStructure()->dehistoriser();

        $this->flush($etablissement);
    }
+1 −1
Changes for module/Application/src/Application/Service/Structure/StructureService.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ class StructureService extends BaseService
            ->leftJoin('structure.structuresSubstituees', 'substitutionFrom')
            ->leftJoin('structure.structureSubstituante', 'substitutionTo')
            ->andWhere('substitutionFrom.id IS NULL')
            ->andWhere('substitutionTo.id IS NULL')
            ->andWhere('substitutionTo.id IS NULL OR pasHistorise(substitutionTo) != 1')
        ;

        $result = $qb->getQuery()->getResult();
+2 −0
Changes for module/Application/src/Application/Service/UniteRecherche/UniteRechercheService.php: 2 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -88,6 +88,7 @@ class UniteRechercheService extends BaseService implements RoleServiceAwareInter
    public function deleteSoftly(UniteRecherche $ur, Utilisateur $destructeur)
    {
        $ur->historiser($destructeur);
        $ur->getStructure()->historiser($destructeur);

        $this->flush($ur);
    }
@@ -95,6 +96,7 @@ class UniteRechercheService extends BaseService implements RoleServiceAwareInter
    public function undelete(UniteRecherche $ur)
    {
        $ur->dehistoriser();
        $ur->getStructure()->dehistoriser();

        $this->flush($ur);
    }