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

Merge branch 'develop'

parents eb07a158 e210d12f

module/Application/config/others/substitution.config.php

+4 −2
Original line number Diff line number Diff line
@@ -157,8 +157,10 @@ return [ 
                            'substitution' => [

                                'label'    => 'Substitutions',

                                'route'    => 'substitution-index',

//                                'resource' => PrivilegeController::getResourceId('Application\Controller\Admin', 'index'),

                                'resource' => SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUION_CONSULTATION_ECOLE),

                                'resources' => [

                                    SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUTION_CONSULTATION_TOUTES_STRUCTURES),

                                    SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUTION_CONSULTATION_SA_STRUCTURE),

                                ],

                                'order'    => 50,

                            ],

                        ],

module/Application/src/Application/Entity/Db/Repository/IndividuRepository.php

+2 −2
Original line number Diff line number Diff line
@@ -49,9 +49,9 @@ class IndividuRepository extends DefaultEntityRepository 
        $text = Util::reduce($text);

        $criteres = explode(' ', $text);



        $sql = sprintf('SELECT * FROM INDIVIDU i JOIN INDIVIDU_RECH ir on ir.id = i.id WHERE rownum <= %s ', (int)$limit);

        $sql = sprintf('SELECT * FROM INDIVIDU i JOIN INDIVIDU_RECH ir on ir.id = i.id WHERE i.HISTO_DESTRUCTION IS NULL AND rownum <= %s ', (int)$limit);

        if ($type !== null) {

            $sql = sprintf('SELECT * FROM INDIVIDU i JOIN INDIVIDU_RECH ir on ir.id = i.id WHERE i.type = \'%s\' AND  rownum <= %s ', $type, (int)$limit);

            $sql = sprintf('SELECT * FROM INDIVIDU i JOIN INDIVIDU_RECH ir on ir.id = i.id WHERE i.HISTO_DESTRUCTION IS NULL AND  i.type = \'%s\' AND  rownum <= %s ', $type, (int)$limit);

            $tmp = null;

        }

        $sqlCri  = [];

module/Application/src/Application/Provider/Privilege/SubstitutionPrivileges.php

+4 −6
Original line number Diff line number Diff line
@@ -10,12 +10,10 @@ use UnicaenAuth\Provider\Privilege\Privileges; 
class SubstitutionPrivileges extends Privileges

{

    const SUBSTITUION_AUTOMATIQUE                    = 'substitution-automatique';

    const SUBSTITUION_CONSULTATION_ETABLISSEMENT     = 'substitution-consultation-etablissement';

    const SUBSTITUION_MODIFICATION_ETABLISSEMENT     = 'substitution-modification-etablissement';

    const SUBSTITUION_CONSULTATION_ECOLE             = 'substitution-consultation-ecole';

    const SUBSTITUION_MODIFICATION_ECOLE             = 'substitution-modification-ecole';

    const SUBSTITUION_CONSULTATION_UNITE             = 'substitution-consultation-unite';

    const SUBSTITUION_MODIFICATION_UNITE             = 'substitution-modification-unite';





    const SUBSTITUTION_CONSULTATION_TOUTES_STRUCTURES   = 'substitution-consultation-toutes-structures';

    const SUBSTITUTION_CONSULTATION_SA_STRUCTURE        = 'substitution-consultation-sa-structure';

    const SUBSTITUTION_MODIFICATION_TOUTES_STRUCTURES   = 'substitution-modification-toutes-structures';

    const SUBSTITUTION_MODIFICATION_SA_STRUCTURE        = 'substitution-modification-sa-structure';

}
 
 No newline at end of file

module/Application/src/Application/Service/Profil/ProfilService.php

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ class ProfilService { 
    public function getProfils()

    {

        $qb = $this->getEntityManager()->getRepository(Profil::class)->createQueryBuilder('profil')

            ->orderBy('profil.libelle')

            ->orderBy('profil.structureType, profil.libelle')

        ;

        $result = $qb->getQuery()->getResult();

        return $result;

module/Application/view/application/ecole-doctorale/index.phtml

+4 −1
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
use Application\Entity\Db\EcoleDoctorale;

use Application\Filter\EtablissementPrefixFilter;

use Application\Provider\Privilege\StructurePrivileges;

use Application\Provider\Privilege\SubstitutionPrivileges;



/**

 * @see \Application\Controller\EcoleDoctoraleController::indexAction()
@@ -11,6 +12,8 @@ use Application\Provider\Privilege\StructurePrivileges; 


$canModifier = $this->isAllowed(StructurePrivileges::getResourceId(StructurePrivileges::STRUCTURE_MODIFICATION_TOUTES_STRUCTURES));

$canAjouter = $this->isAllowed(StructurePrivileges::getResourceId(StructurePrivileges::STRUCTURE_MODIFICATION_TOUTES_STRUCTURES));

$canSubstituer = $this->isAllowed(SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUTION_CONSULTATION_TOUTES_STRUCTURES))

    OR $this->isAllowed(SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUTION_CONSULTATION_SA_STRUCTURE));



$prefixFilter = new EtablissementPrefixFilter();

?>
@@ -76,7 +79,7 @@ $prefixFilter = new EtablissementPrefixFilter(); 
                        </a>

                    <?php endif; ?>



                    <?php if (($canModifier OR $canModifierCetteEcole) AND !$historisee AND $hasSousStructure) : ?>

                    <?php if ($canSubstituer AND !$historisee AND $hasSousStructure) : ?>

                        <a href="<?php echo $this->url('substitution-modifier', ['cible' => $ecole->getStructure()->getId(), [], true]); ?>"

                           title="Historiser l'établissement">

                            <span class="glyphicon glyphicon-link" title="Éditer la substitution"></span>