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

merging

parents 5b99e705 79b7289f
Loading
Loading
Loading
Loading
+1 −0
Changes for config/application.config.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ $modules = [
    'UnicaenUtilisateurLdapAdapter',
    'Mailing',
    'UnicaenUtilisateur',
    'UnicaenDocument',
    'UnicaenValidation',
    'Autoform',
    'Fichier',
+2 −2
Changes for config/autoload/unicaen-app.global.php: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -24,8 +24,8 @@ return [
         * Informations concernant cette application
         */
        'app_infos' => [
            'nom'     => "PrECoG",
            'desc'    => "Prévisionnel des emplois et des compétences : Outil de gestion",
            'nom'     => "EMC2",
            'desc'    => "Emploi Mobilité Carrière Compétences",
            'version' => "0.4.9",
            'date'    => "13/12/2019",
            'contact' => ['mail' => "dsi.applications@unicaen.fr", /*'tel' => "01 02 03 04 05"*/],
+18 −0
Changes for module/Application/config/merged/entretien-professionnel.config.php: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -55,6 +55,13 @@ return [
        ],
        'guards' => [
            PrivilegeController::class => [
                [
                    'controller' => EntretienProfessionnelController::class,
                    'action' => [
                        'accepter-entretien',
                    ],
                    'roles' => [],
                ],
                [
                    'controller' => EntretienProfessionnelController::class,
                    'action' => [
@@ -224,6 +231,17 @@ return [
                    ],
                ],
                'child_routes' => [
                    'accepter-entretien' => [
                        'type'  => Segment::class,
                        'may_terminate' => true,
                        'options' => [
                            'route'    => '/accepter-entretien/:entretien-professionnel/:token',
                            'defaults' => [
                                'controller' => EntretienProfessionnelController::class,
                                'action'     => 'accepter-entretien',
                            ],
                        ],
                    ],
                    'creer' => [
                        'type'  => Segment::class,
                        'may_terminate' => true,
+11 −0
Changes for module/Application/config/merged/formation.config.php: 11 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ return [
                        'editer',
                        'editer-groupe',
                        'editer-theme',
                        'update-ordre-groupe'
                        'modifier-formation-informations',
                        'ajouter-instance',
                    ],
@@ -492,6 +493,16 @@ return [
                ],
                'may_terminate' => false,
                'child_routes' => [
                    'update-ordre-groupe' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/update-ordre-groupe/:ordre',
                            'defaults' => [
                                'controller' => FormationController::class,
                                'action'     => 'update-ordre-groupe',
                            ],
                        ],
                    ],
                    'afficher' => [
                        'type'  => Segment::class,
                        'options' => [
+26 −0
Changes for module/Application/config/merged/structure.config.php: 26 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ return [
                    'action' => [
                        'ajouter-gestionnaire',
                        'retirer-gestionnaire',
                        'ajouter-responsable',
                        'retirer-responsable',
                    ],
                    'privileges' => StructurePrivileges::STRUCTURE_GESTIONNAIRE,
                    'assertion'  => StructureAssertion::class,
@@ -172,6 +174,30 @@ return [
                        'may_terminate' => true,
                        'child_routes' => [],
                    ],
                    'ajouter-responsable' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/ajouter-responsable/:structure',
                            'defaults' => [
                                'controller' => StructureController::class,
                                'action'     => 'ajouter-responsable',
                            ],
                        ],
                        'may_terminate' => true,
                        'child_routes' => [],
                    ],
                    'retirer-responsable' => [
                        'type'  => Segment::class,
                        'options' => [
                            'route'    => '/retirer-responsable/:structure/:responsable',
                            'defaults' => [
                                'controller' => StructureController::class,
                                'action'     => 'retirer-responsable',
                            ],
                        ],
                        'may_terminate' => true,
                        'child_routes' => [],
                    ],
                    'editer-description' => [
                        'type'  => Segment::class,
                        'options' => [
Loading