Commit 38ecd0cd authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'master' of git.unicaen.fr:dsi/sygal

parents 7f9cdb4a d781b004

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/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/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>

module/Application/view/application/etablissement/index.phtml

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

use Application\Filter\EtablissementPrefixFilter;

use Application\Provider\Privilege\StructurePrivileges;

use Application\Provider\Privilege\SubstitutionPrivileges;



/**

 * @see \Application\Controller\EtablissementController::indexAction()
@@ -12,6 +13,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();

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

                    <?php endif; ?>



                    <?php if (($canModifier OR $canModifierCetEtab) && !$historisee && $hasSousStructure) : ?>

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

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

                           title="Historiser l'établissement">

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

module/Application/view/application/substitution/index-structure.phtml

+4 −7
Original line number Diff line number Diff line
@@ -11,22 +11,19 @@ use Application\Provider\Privilege\SubstitutionPrivileges; 


 $libelle = 'Structure';

 $canEdit = false;

 $canView = false;

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

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

$canEdit =  $this->isAllowed(SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUTION_MODIFICATION_TOUTES_STRUCTURES))

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

  switch($type) {

     case TypeStructure::CODE_ECOLE_DOCTORALE :

         $libelle   = 'École doctorale';

         $canView   = $this->isAllowed(SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUION_CONSULTATION_ECOLE));

         $canEdit   = $this->isAllowed(SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUION_MODIFICATION_ECOLE));

         break;

     case TypeStructure::CODE_UNITE_RECHERCHE :

         $libelle   = 'Unité de recherche';

         $canView   = $this->isAllowed(SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUION_CONSULTATION_UNITE));

         $canEdit   = $this->isAllowed(SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUION_MODIFICATION_UNITE));

         break;

     case TypeStructure::CODE_ETABLISSEMENT :

         $libelle   = 'Établissement';

         $canView   = $this->isAllowed(SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUION_CONSULTATION_ETABLISSEMENT));

         $canEdit   = $this->isAllowed(SubstitutionPrivileges::getResourceId(SubstitutionPrivileges::SUBSTITUION_MODIFICATION_ETABLISSEMENT));

         break;

 }