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

Merge branch 'RefontePrivileges' into develop

parents f0b3cf68 4a08a2ec
Loading
Loading
Loading
Loading
+3 −4
Changes for module/Application/config/others/admin.config.php: 3 added lines, 4 removed lines.
Original line number Diff line number Diff line
<?php

use Application\Controller\AdminController;
use Application\Controller\Factory\PrivilegeControllerFactory;
use Application\Controller\Factory\RoleControllerFactory;
use Application\Controller\MailConfirmationController;
use Application\Controller\RoleController;
use Application\Provider\Privilege\EcoleDoctoralePrivileges;
use Application\Provider\Privilege\StructurePrivileges;
use Application\Provider\Privilege\UniteRecherchePrivileges;
use Application\Provider\Privilege\UtilisateurPrivileges;
use UnicaenAuth\Guard\PrivilegeController;
@@ -40,8 +39,8 @@ return [
                    ],
                    'privileges' => [
                        UtilisateurPrivileges::UTILISATEUR_ATTRIBUTION_ROLE,
                        EcoleDoctoralePrivileges::ECOLE_DOCT_CONSULTATION,
                        UniteRecherchePrivileges::UNITE_RECH_CONSULTATION,
                        StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES,
                        StructurePrivileges::STRUCTURE_CONSULTATION_SES_STRUCTURES,
                     ],
                ],
                [
+39 −84
Changes for module/Application/config/others/ecole-doctorale.config.php: 39 added lines, 84 removed lines.
Original line number Diff line number Diff line
<?php

use Application\Controller\EcoleDoctoraleController;
use Application\Controller\Factory\EcoleDoctoraleControllerFactory;
use Application\Form\Factory\EcoleDoctoraleFormFactory;
use Application\Form\Factory\EcoleDoctoraleHydratorFactory;
use Application\Provider\Privilege\EcoleDoctoralePrivileges;
use Application\Provider\Privilege\StructurePrivileges;
use Application\Service\EcoleDoctorale\EcoleDoctoraleService;
use Application\View\Helper\EcoleDoctoraleHelper;
use UnicaenAuth\Guard\PrivilegeController;
use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider;
use Zend\Mvc\Router\Http\Literal;
use Zend\Mvc\Router\Http\Segment;

return [
    'bjyauthorize'    => [
        'resource_providers' => [
            'BjyAuthorize\Provider\Resource\Config' => [
                'EcoleDoctorale' => [],
            ],
        ],
        'rule_providers'     => [
            PrivilegeRuleProvider::class => [
                'allow' => [
                    [
                        'privileges' => [
                            EcoleDoctoralePrivileges::ECOLE_DOCT_MODIFICATION,
                        ],
                        'resources'  => ['EcoleDoctorale'],
                        'assertion'  => 'Assertion\\EcoleDoctorale',
                    ],
                ],
            ],
        ],
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => 'Application\Controller\EcoleDoctorale',
                    'controller' => EcoleDoctoraleController::class,
                    'action'     => [
                        'index',
                        'information'
                    ],
                    'privileges' => EcoleDoctoralePrivileges::ECOLE_DOCT_CONSULTATION,
                    'privileges' => [
                        StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES,
                        StructurePrivileges::STRUCTURE_CONSULTATION_SES_STRUCTURES,
                    ],
                ],
                [
                    'controller' => 'Application\Controller\EcoleDoctorale',
                    'controller' => EcoleDoctoraleController::class,
                    'action'     => [
                        'ajouter',
                        'supprimer',
                        'restaurer',
                    ],
                    'privileges' => EcoleDoctoralePrivileges::ECOLE_DOCT_CREATION,
                    'privileges' => [
                        StructurePrivileges::STRUCTURE_MODIFICATION_TOUTES_STRUCTURES,
                        StructurePrivileges::STRUCTURE_MODIFICATION_SES_STRUCTURES,
                    ],
                ],
                [
                    'controller' => 'Application\Controller\EcoleDoctorale',
                    'controller' => EcoleDoctoraleController::class,
                    'action'     => [
                        'modifier',
                        'ajouter-individu',
                        'retirer-individu',
                        'supprimer-logo',
                    ],
                    'privileges' => EcoleDoctoralePrivileges::ECOLE_DOCT_MODIFICATION,
                    'privileges' => [
                        StructurePrivileges::STRUCTURE_MODIFICATION_TOUTES_STRUCTURES,
                        StructurePrivileges::STRUCTURE_MODIFICATION_SES_STRUCTURES,
                    ],
                ],
            ],
        ],
@@ -65,14 +57,12 @@ return [
    'router'          => [
        'routes' => [
            'ecole-doctorale' => [
                'type'          => 'Segment',
                'type'          => Literal::class,
                'options'       => [
                    'route'    => '/[:language/]ecole-doctorale',
                    'route'    => '/ecole-doctorale',
                    'defaults' => [
                        '__NAMESPACE__' => 'Application\Controller',
                        'controller'    => 'EcoleDoctorale',
                        'controller'    => EcoleDoctoraleController::class,
                        'action'        => 'index',
                        'language'      => 'fr_FR',
                    ],
                ],
                'may_terminate' => true,
@@ -80,15 +70,14 @@ return [
                    'information' => [
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/information/:ecoleDoctorale',
                            'route'       => '/information/:structure',
                            'defaults'    => [
                                'action' => 'information',
                            ],
                        ],

                    ],
                    'ajouter' => [
                        'type'          => 'Segment',
                        'type'          => Literal::class,
                        'options'       => [
                            'route'       => '/ajouter',
                            'defaults'    => [
@@ -97,73 +86,36 @@ return [
                        ],
                    ],
                    'supprimer' => [
                        'type'          => 'Segment',
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/:ecoleDoctorale/supprimer',
                            'constraints' => [
                                'ecoleDoctorale' => '\d+',
                            ],
                            'route'       => '/supprimer/:structure',
                            'defaults'    => [
                                'action' => 'supprimer',
                            ],
                        ],
                    ],
                    'restaurer' => [
                        'type'          => 'Segment',
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/:ecoleDoctorale/restaurer',
                            'constraints' => [
                                'ecoleDoctorale' => '\d+',
                            ],
                            'route'       => '/restaurer/:structure',
                            'defaults'    => [
                                'action' => 'restaurer',
                            ],
                        ],
                    ],
                    'modifier' => [
                        'type'          => 'Segment',
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/:ecoleDoctorale/modifier',
                            'constraints' => [
                                'ecoleDoctorale' => '\d+',
                            ],
                            'route'       => '/modifier/:structure',
                            'defaults'    => [
                                'action' => 'modifier',
                            ],
                        ],
                    ],
                    'ajouter-individu' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/:ecoleDoctorale/ajouter-individu',
                            'constraints' => [
                                'ecoleDoctorale' => '\d+',
                            ],
                            'defaults'    => [
                                'action' => 'ajouter-individu',
                            ],
                        ],
                    ],
                    'retirer-individu' => [
                        'type'          => 'Segment',
                        'options'       => [
                            'route'       => '/:ecoleDoctorale/retirer-individu/:edi',
                            'constraints' => [
                                'ecoleDoctorale' => '\d+',
                                'edi' => '\d+',
                            ],
                            'defaults'    => [
                                'action' => 'retirer-individu',
                            ],
                        ],
                    ],
                    'supprimer-logo' => [
                        'type'          => 'Segment',
                        'type'          => Segment::class,
                        'options'       => [
                            'route'       => '/supprimer-logo/:ecoleDoctorale',
                            'constraints' => [
                                'ecoleDoctorale' => '\d+',
                            ],
                            'route'       => '/supprimer-logo/:structure',
                            'defaults'    => [
                                'action' => 'supprimer-logo',
                            ],
@@ -182,28 +134,28 @@ return [
                            'ecole-doctorale' => [
                                'label'    => 'Écoles doctorales',
                                'route'    => 'ecole-doctorale',
                                'resource' => PrivilegeController::getResourceId('Application\Controller\EcoleDoctorale', 'index'),
                                'resource' => PrivilegeController::getResourceId(EcoleDoctoraleController::class, 'index'),

                                'order'    => 10,
                                'pages' => [
                                    'modification' => [
                                        'label'    => 'Modification',
                                        'route'    => 'ecole-doctorale/modifier',
                                        'resource' => PrivilegeController::getResourceId('Application\Controller\EcoleDoctorale', 'index'),
                                        'resource' => PrivilegeController::getResourceId(EcoleDoctoraleController::class, 'index'),

                                        'withtarget' => true,
                                        'paramsInject' => [
                                            'ecoleDoctorale',
                                            'structure',
                                        ],
                                    ],
                                    'information' => [
                                        'label'    => 'Détails',
                                        'route'    => 'ecole-doctorale/information',
                                        'resource' => PrivilegeController::getResourceId('Application\Controller\EcoleDoctorale', 'index'),
                                        'resource' => PrivilegeController::getResourceId(EcoleDoctoraleController::class, 'index'),

                                        'withtarget' => true,
                                        'paramsInject' => [
                                            'ecoleDoctorale',
                                            'structure',
                                        ],
                                    ],
                                ],
@@ -230,6 +182,9 @@ return [
        'factories' => [
            'Application\Controller\EcoleDoctorale' => EcoleDoctoraleControllerFactory::class,
        ],
        'aliases' => [
            EcoleDoctoraleController::class => 'Application\Controller\EcoleDoctorale',
        ]
    ],
    'form_elements'   => [
        'invokables' => [
+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 −2
Changes for module/Application/config/others/statistique.config.php: 5 added lines, 2 removed lines.
Original line number Diff line number Diff line
<?php

use Application\Provider\Privilege\EcoleDoctoralePrivileges;
use Application\Provider\Privilege\StructurePrivileges;
use UnicaenAuth\Guard\PrivilegeController;
use Zend\Mvc\Router\Http\Literal;
use Application\Controller\Factory\StatistiqueControllerFactory;
@@ -14,7 +14,10 @@ return [
                    'action'     => [
                        'index',
                    ],
                    'privileges' => EcoleDoctoralePrivileges::ECOLE_DOCT_CONSULTATION,
                    'privileges' => [
                        StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES,
                        StructurePrivileges::STRUCTURE_CONSULTATION_SES_STRUCTURES,
                    ],
                ],
            ],
        ],
+25 −9
Changes for module/Application/config/others/structure.config.php: 25 added lines, 9 removed lines.
Original line number Diff line number Diff line
<?php

use Application\Controller\Factory\EcoleDoctoraleControllerFactory;
use Application\Controller\Factory\StructureControllerFactory;
use Application\Controller\StructureController;
use Application\Form\Factory\EcoleDoctoraleFormFactory;
use Application\Form\Factory\EcoleDoctoraleHydratorFactory;
use Application\Provider\Privilege\EcoleDoctoralePrivileges;
use Application\Provider\Privilege\EtablissementPrivileges;
use Application\Service\EcoleDoctorale\EcoleDoctoraleService;
use Application\Provider\Privilege\StructurePrivileges;
use Application\Service\Structure\StructureService;
use Application\Service\Structure\StructureServiceFactory;
use Application\View\Helper\EcoleDoctoraleHelper;
use UnicaenAuth\Guard\PrivilegeController;
use Application\Entity\Db\StructureConcreteInterface;
use Application\View\Helper\StructureSubstitHelper;
use Application\View\Helper\StructureArrayHelper;
use UnicaenAuth\Guard\PrivilegeController;
use UnicaenAuth\Provider\Rule\PrivilegeRuleProvider;
use Zend\Mvc\Router\Http\Segment;

return [

    'bjyauthorize'    => [
        'resource_providers' => [
            'BjyAuthorize\Provider\Resource\Config' => [
                'structure' => [],
            ],
        ],
        'rule_providers'     => [
            PrivilegeRuleProvider::class => [
                'allow' => [
                    [
                        'privileges' => [
                            StructurePrivileges::STRUCTURE_CONSULTATION_TOUTES_STRUCTURES,
                            StructurePrivileges::STRUCTURE_CONSULTATION_SES_STRUCTURES,
                            StructurePrivileges::STRUCTURE_MODIFICATION_TOUTES_STRUCTURES,
                            StructurePrivileges::STRUCTURE_MODIFICATION_SES_STRUCTURES,
                        ],
                        'resources'  => ['structure'],
                        'assertion'  => 'Assertion\\Structure',
                    ],
                ],
            ],
        ],
        'guards' => [
            PrivilegeController::class => [
                [
Loading