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

Merge branch 'hotfix_date_butoir_2nd_depot' into develop

parents 0105e710 433cb5d9

module/Application/src/Application/Entity/Db/These.php

+2 −2
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ class These implements HistoriqueAwareInterface, ResourceInterface 
        self::CORRECTION_AUTORISEE_FACULTATIVE => "Facultatives",

    ];



    const CORRECTION_OBLIGATOIRE_INTERVAL = 'P2M';

    const CORRECTION_FACULTATIVE_INTERVAL = 'P3M';

    const CORRECTION_OBLIGATOIRE_INTERVAL = 'P3M';

    const CORRECTION_FACULTATIVE_INTERVAL = 'P2M';



    const CORRECTION_AUTORISEE_FORCAGE_NON = null; // pas de forçage

    const CORRECTION_AUTORISEE_FORCAGE_AUCUNE = 'aucune'; // aucune correction autorisée

module/Application/src/Application/Service/These/TheseRechercheService.php

+9 −9
Original line number Diff line number Diff line
@@ -508,15 +508,15 @@ class TheseRechercheService 


    private function fetchEtablissementsOptions()

    {

        $role = $this->getSelectedIdentityRole();



        $privilege = StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES;

        $toutesStructuresAllowed = $this->authorizeService->isAllowed(StructurePrivileges::getResourceId($privilege));

        if ($role && !$toutesStructuresAllowed) {

            return [

                $this->optionify($role->getStructure()->getEtablissement())

            ];

        }

//        $role = $this->getSelectedIdentityRole();

//

//        $privilege = StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES;

//        $toutesStructuresAllowed = $this->authorizeService->isAllowed(StructurePrivileges::getResourceId($privilege));

//        if ($role && !$toutesStructuresAllowed) {

//            return [

//                $this->optionify($role->getStructure()->getEtablissement())

//            ];

//        }



        $etablissements = $this->getEtablissementService()->getRepository()->findAllEtablissementsMembres();