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

Merge branch 'master' into bg-php8

parents f43e38ec 81a26001
Loading
Loading
Loading
Loading

.gitignore

0 → 100644
+3 −0
Original line number Diff line number Diff line
.idea/
vendor/
.sass-cache/
+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ class Module
    {
        $e->getApplication()->getServiceManager()->get('translator');
        $eventManager        = $e->getApplication()->getEventManager();
        $moduleRouteListener = new ModuleRouteListener();
        $moduleRouteListener->attach($eventManager);
//        $moduleRouteListener = new ModuleRouteListener();
//        $moduleRouteListener->attach($eventManager);

        /* Active un layout spécial si la requête est de type AJAX. Valable pour TOUS les modules de l'application. */
        $eventManager->getSharedManager()->attach('Laminas\Mvc\Controller\AbstractActionController', 'dispatch',
+2 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@
        }
    ],
    "require": {
        "unicaen/app": "dev-ll-php8",
      "unicaen/privilege": "dev-bg-php8",
      "laminas/laminas-dependency-plugin": "^2.2"
    },
+1 −19
Original line number Diff line number Diff line
@@ -27,25 +27,7 @@ return [
        ],
    ],

    'navigation' => [
        'default' => [
            'home' => [
                'pages' => [
                    'administration' => [
                        'pages' => [
                            'contenu' => [
                                'label' => 'Templates et macros',
                                'route' => 'contenu/template',
                                'resource' => PrivilegeController::getResourceId(IndexController::class, 'index'),
                                'order'    => 10001,
                                'icon' => 'fas fa-angle-right',
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],


    'router' => [
        'routes' => [
+6 −9
Original line number Diff line number Diff line
@@ -63,16 +63,13 @@ return [
            'home' => [
                'pages' => [
                    'administration' => [
                        'pages' => [
                            'contenu' => [
                        'pages' => [
                            'macro' => [
                                        'label' => 'Macro',
                                'label' => 'Macros',
                                'route' => 'contenu/macro',
                                'resource' => PrivilegeController::getResourceId(MacroController::class, 'index'),
                                        'order'    => 10001,
                                    ],
                                ],
                                'order'    => 10100,
                                'icon' => 'fas fa-angle-right',
                            ],
                        ],
                    ],
Loading