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

Nettoyage de privilèges associés au établissement

parent 80779f42
Loading
Loading
Loading
Loading
+34 −62
Changes for module/Application/config/others/etablissement.config.php: 34 added lines, 62 removed lines.
Original line number Diff line number Diff line
<?php

use Application\Controller\EtablissementController;
use Application\Controller\Factory\EtablissementControllerFactory;
use Application\Form\Factory\EtablissementFormFactory;
use Application\Form\Factory\EtablissementHydratorFactory;
use Application\Provider\Privilege\EcoleDoctoralePrivileges;
use Application\Provider\Privilege\EtablissementPrivileges;
use Application\Provider\Privilege\StructurePrivileges;
use Application\Service\Etablissement\EtablissementService;
use Application\View\Helper\EtablissementHelper;
use UnicaenAuth\Guard\PrivilegeController;
use Zend\Mvc\Router\Http\Literal;
use Zend\Mvc\Router\Http\Segment;

return [
@@ -15,25 +16,29 @@ return [
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => 'Application\Controller\Etablissement',
                    'controller' => EtablissementController::class,
                    'action'     => [
                        'index',
                        'information',
                    ],
                    'privileges' => EtablissementPrivileges::ETABLISSEMENT_CONSULTATION,
                    'privileges' => [
                        StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES,
                        StructurePrivileges::STRUCTURE_CONSULTATION_SES_STRUCTURES,
                    ],
                ],
                [
                    'controller' => 'Application\Controller\Etablissement',
                    'controller' => EtablissementController::class,
                    'action'     => [
                        'ajouter',
                        'supprimer',
                        'restaurer',
                        'modifier',
                        'ajouter-individu',
                        'retirer-individu',
                        'supprimer-logo',
                    ],
                    'privileges' => EtablissementPrivileges::ETABLISSEMENT_MODIFICATION,
                    'privileges' => [
                        StructurePrivileges::STRUCTURE_MODIFICATION_TOUTES_STRUCTURES,
                        StructurePrivileges::STRUCTURE_MODIFICATION_SES_STRUCTURES,
                    ],
                ],
            ],
        ],
@@ -41,14 +46,12 @@ return [
    'router'          => [
        'routes' => [
            'etablissement' => [
                'type'          => 'Segment',
                'type'          => Literal::class,
                'options'       => [
                    'route'    => '/[:language/]etablissement',
                    'route'    => '/etablissement',
                    'defaults' => [
                        '__NAMESPACE__' => 'Application\Controller',
                        'controller'    => 'Etablissement',
                        'controller'    => EtablissementController::class,
                        'action'        => 'index',
                        'language'      => 'fr_FR',
                    ],
                ],
                'may_terminate' => true,
@@ -56,14 +59,14 @@ return [
                    'information' => [
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/information/:etablissement',
                            'route'       => '/information/:structure',
                            'defaults'    => [
                                'action' => 'information',
                            ],
                        ],
                    ],
                    'ajouter' => [
                        'type'          => 'Segment',
                        'type'          => Literal::class,
                        'options'       => [
                            'route'       => '/ajouter',
                            'defaults'    => [
@@ -72,33 +75,27 @@ return [
                        ],
                    ],
                    'supprimer' => [
                        'type'          => 'Segment',
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/:etablissement/supprimer',
                            'constraints' => [
                                'etablissement' => '\d+',
                            ],
                            'route'       => '/supprimer/:structure',
                            'defaults'    => [
                                'action' => 'supprimer',
                            ],
                        ],
                    ],
                    'restaurer' => [
                        'type'          => 'Segment',
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/:etablissement/restaurer',
                            'constraints' => [
                                'ecoleDoctorale' => '\d+',
                            ],
                            'route'       => '/restaurer/:structure',
                            'defaults'    => [
                                'action' => 'restaurer',
                            ],
                        ],
                    ],
                    'modifier' => [
                        'type'          => 'Segment',
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/:etablissement/modifier',
                            'route'       => '/modifier/:structure',
                            'constraints' => [
                                'etablissement' => '\d+',
                            ],
@@ -107,38 +104,10 @@ return [
                            ],
                        ],
                    ],
                    'ajouter-individu' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/:etablissement/ajouter-individu',
                            'constraints' => [
                                'etablissement' => '\d+',
                            ],
                            'defaults'    => [
                                'action' => 'ajouter-individu',
                            ],
                        ],
                    ],
                    'retirer-individu' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/:etablissement/retirer-individu/:etabi',
                            'constraints' => [
                                'etablissement' => '\d+',
                                'etabi' => '\d+',
                            ],
                            'defaults'    => [
                                'action' => 'retirer-individu',
                            ],
                        ],
                    ],
                    'supprimer-logo' => [
                        'type'          => 'Segment',
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/supprimer-logo/:etablissement',
                            'constraints' => [
                                'etablissement' => '\d+',
                            ],
                            'route'       => '/supprimer-logo/:structure',
                            'defaults'    => [
                                'action' => 'supprimer-logo',
                            ],
@@ -157,27 +126,27 @@ return [
                            'etablissement' => [
                                'label'    => 'Établissements',
                                'route'    => 'etablissement',
                                'resource' => PrivilegeController::getResourceId('Application\Controller\Etablissement', 'index'),
                                'resource' => PrivilegeController::getResourceId(EtablissementController::class, 'index'),
                                'order'    => 5,
                                'pages' => [
                                    'modification' => [
                                        'label'    => 'Modification',
                                        'route'    => 'etablissement/modifier',
                                        'resource' => PrivilegeController::getResourceId('Application\Controller\Etablissement', 'index'),
                                        'resource' => PrivilegeController::getResourceId(EtablissementController::class, 'index'),

                                        'withtarget' => true,
                                        'paramsInject' => [
                                            'etablissement',
                                            'structure',
                                        ],
                                    ],
                                    'information' => [
                                        'label'    => 'Détails',
                                        'route'    => 'etablissement/information',
                                        'resource' => PrivilegeController::getResourceId('Application\Controller\Etablissement', 'index'),
                                        'resource' => PrivilegeController::getResourceId(EtablissementController::class, 'index'),

                                        'withtarget' => true,
                                        'paramsInject' => [
                                            'etablissement',
                                            'structure',
                                        ],
                                    ],
                                ],
@@ -204,6 +173,9 @@ return [
        'factories' => [
            'Application\Controller\Etablissement' => EtablissementControllerFactory::class,
        ],
        'aliases' => [
            EtablissementController::class => 'Application\Controller\Etablissement',
        ]
    ],
    'form_elements'   => [
        'invokables' => [
+5 −7
Changes for module/Application/src/Application/Controller/EtablissementController.php: 5 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -6,9 +6,7 @@ use Application\Entity\Db\Etablissement;
use Application\Entity\Db\Individu;
use Application\Entity\Db\IndividuRole;
use Application\Entity\Db\Role;
use Application\Entity\Db\SourceInterface;
use Application\Entity\Db\Structure;
use Application\Entity\Db\StructureConcreteInterface;
use Application\Entity\Db\TypeStructure;
use Application\Form\EtablissementForm;
use Application\Service\Etablissement\EtablissementServiceAwareTrait;
@@ -67,7 +65,7 @@ class EtablissementController extends AbstractController

    public function informationAction()
    {
        $id = $this->params()->fromRoute('etablissement');
        $id = $this->params()->fromRoute('structure');
        $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($id);
        if ($etablissement === null) {
            throw new RuntimeException("Aucun établissement ne possède l'identifiant renseigné.");
@@ -156,7 +154,7 @@ class EtablissementController extends AbstractController

    public function supprimerAction()
    {
        $structureId = $this->params()->fromRoute("etablissement");
        $structureId = $this->params()->fromRoute("structure");
        $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);

        $destructeur = $this->userContextService->getIdentityDb();
@@ -169,7 +167,7 @@ class EtablissementController extends AbstractController
    public function modifierAction()
    {
        /** @var Etablissement $etablissement */
        $structureId = $this->params()->fromRoute("etablissement");
        $structureId = $this->params()->fromRoute("structure");
        $etablissement = null;
        if ($structureId) {
            $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);
@@ -222,7 +220,7 @@ class EtablissementController extends AbstractController

    public function restaurerAction()
    {
        $structureId = $this->params()->fromRoute("etablissement");
        $structureId = $this->params()->fromRoute("structure");
        $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);

        $this->getEtablissementService()->undelete($etablissement);
@@ -246,7 +244,7 @@ class EtablissementController extends AbstractController
     */
    public function supprimerLogoEtablissement()
    {
        $structureId = $this->params()->fromRoute("etablissement");
        $structureId = $this->params()->fromRoute("structure");
        $etablissement = $this->getEtablissementService()->getRepository()->findByStructureId($structureId);

        $this->getEtablissementService()->deleteLogo($etablissement);
+17 −16
Changes for module/Application/view/application/etablissement/index.phtml: 17 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -2,17 +2,16 @@

use Application\Entity\Db\Etablissement;
use Application\Filter\EtablissementPrefixFilter;
use Application\Provider\Privilege\EtablissementPrivileges;
use Application\View\Renderer\PhpRenderer;
use Application\Provider\Privilege\StructurePrivileges;

/**
 * @see \Application\Controller\EtablissementController::indexAction()
 * @var PhpRenderer $this
 * @var Etablissement[] $etablissementsSygal
 * @var Etablissement[] $etablissementsExternes
 */

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

$prefixFilter = new EtablissementPrefixFilter();
?>
@@ -63,11 +62,12 @@ $prefixFilter = new EtablissementPrefixFilter();
            <?php
            $historisee = (!$etablissement->estNonHistorise());
            $hasSousStructure = !($etablissement->getStructure()->getStructuresSubstituees()->isEmpty());
            $canModifierCetEtab = $this->isAllowed($etablissement->getStructure(),StructurePrivileges::STRUCTURE_MODIFICATION_SES_STRUCTURES);
            ?>

            <tr>
                <td>
                    <a href="<?php echo $this->url('etablissement/information', ['etablissement' => $etablissement->getStructure()->getId()], [], true); ?>">
                    <a href="<?php echo $this->url('etablissement/information', ['structure' => $etablissement->getStructure()->getId()], [], true); ?>">
                        <?php echo $etablissement->getLibelle(); ?>
                    </a>
                    <?php if ($etablissement->estMembre()): ?>
@@ -85,22 +85,22 @@ $prefixFilter = new EtablissementPrefixFilter();
                </td>
                <td> <?php echo $etablissement->getSigle(); ?> </td>
                <td>
                    <?php if ($canModifier && !$historisee) : ?>
                        <a href="<?php echo $this->url('etablissement/supprimer', ["etablissement" => $etablissement->getStructure()->getId()], [], true); ?>"
                    <?php if (($canModifier OR $canModifierCetEtab) && !$historisee) : ?>
                        <a href="<?php echo $this->url('etablissement/supprimer', ["structure" => $etablissement->getStructure()->getId()], [], true); ?>"
                           title="Historiser l'établissement">
                            <span class="glyphicon glyphicon-trash"></span>
                        </a>
                    <?php endif; ?>

                    <?php if ($canModifier && !$historisee && $hasSousStructure) : ?>
                    <?php if (($canModifier OR $canModifierCetEtab) && !$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>
                        </a>
                    <?php endif; ?>

                    <?php if ($canModifier && $historisee) : ?>
                        <a href="<?php echo $this->url('etablissement/restaurer', ["etablissement" => $etablissement->getStructure()->getId()], [], true); ?>"
                    <?php if (($canModifier OR $canModifierCetEtab) && $historisee) : ?>
                        <a href="<?php echo $this->url('etablissement/restaurer', ["structure" => $etablissement->getStructure()->getId()], [], true); ?>"
                           title="Restaurer l'établissement">
                            Restaurer
                        </a>
@@ -138,11 +138,12 @@ $prefixFilter = new EtablissementPrefixFilter();
            <?php
            $historisee = (!$etablissement->estNonHistorise());
            $hasSousStructure = !($etablissement->getStructure()->getStructuresSubstituees()->isEmpty());
            $canModifierCetEtab = $this->isAllowed($etablissement->getStructure(),StructurePrivileges::STRUCTURE_MODIFICATION_SES_STRUCTURES);
            ?>

            <tr>
                <td>
                    <a href="<?php echo $this->url('etablissement/information', ['etablissement' => $etablissement->getStructure()->getId()], [], true); ?>">
                    <a href="<?php echo $this->url('etablissement/information', ['structure' => $etablissement->getStructure()->getId()], [], true); ?>">
                        <?php echo $etablissement->getLibelle(); ?>
                    </a>
                    <?php if ($etablissement->estMembre()): ?>
@@ -160,22 +161,22 @@ $prefixFilter = new EtablissementPrefixFilter();
                </td>
                <td> <?php echo $etablissement->getSigle(); ?> </td>
                <td>
                    <?php if ($canModifier && !$historisee) : ?>
                        <a href="<?php echo $this->url('etablissement/supprimer', ["etablissement" => $etablissement->getStructure()->getId()], [], true); ?>"
                    <?php if (($canModifier OR $canModifierCetEtab) && !$historisee) : ?>
                        <a href="<?php echo $this->url('etablissement/supprimer', ["structure" => $etablissement->getStructure()->getId()], [], true); ?>"
                           title="Historiser l'établissement">
                            <span class="glyphicon glyphicon-trash"></span>
                        </a>
                    <?php endif; ?>

                    <?php if ($canModifier && !$historisee && $hasSousStructure) : ?>
                    <?php if (($canModifier OR $canModifierCetEtab) && !$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>
                        </a>
                    <?php endif; ?>

                    <?php if ($canModifier && $historisee) : ?>
                        <a href="<?php echo $this->url('etablissement/restaurer', ["etablissement" => $etablissement->getStructure()->getId()], [], true); ?>"
                    <?php if (($canModifier OR $canModifierCetEtab) && $historisee) : ?>
                        <a href="<?php echo $this->url('etablissement/restaurer', ["structure" => $etablissement->getStructure()->getId()], [], true); ?>"
                           title="Restaurer l'établissement">
                            Restaurer
                        </a>
+1 −1
Changes for module/Application/view/application/etablissement/information.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ $canAddRole = true;
</a>

<?php if($canEdit): ?>
    <a href="<?php echo $this->url('etablissement/modifier', ['etablissement'=> $etablissement->getStructure()->getId()], [], true); ?>"
    <a href="<?php echo $this->url('etablissement/modifier', ['structure'=> $etablissement->getStructure()->getId()], [], true); ?>"
       class="btn btn-primary action"
    >
        <span class="glyphicon glyphicon-pencil"></span> Modifier l'établissement
+1 −1
Changes for module/Application/view/application/etablissement/modifier.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ $fcg = $this->formControlGroup();
                    ?>
                    <br/>
                    <?php if($form->getObject()->getId()): ?>
                    <a id="supprimer-logo" class="btn btn-danger" href="<?php echo $this->url('etablissement/supprimer-logo', ["etablissement" => $form->getObject()->getStructure()->getId()], [], true); ?>">
                    <a id="supprimer-logo" class="btn btn-danger" href="<?php echo $this->url('etablissement/supprimer-logo', ["structure" => $form->getObject()->getStructure()->getId()], [], true); ?>">
                        <span class="glyphicon glyphicon-trash"></span>
                        Supprimer le logo
                    </a>