Commit 97fc1d15 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

merging

parents 9f73d6e5 412fd597
Loading
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -9,7 +9,8 @@
    ],
    "require": {
      "unicaen/privilege": "dev-bg-php8",
      "laminas/laminas-dependency-plugin": "^2.2"
      "laminas/laminas-dependency-plugin": "^2.2",
      "php": "^8.0",
    },
  "minimum-stability": "dev",
  "prefer-stable": true,
+0 −2
Original line number Diff line number Diff line
@@ -27,8 +27,6 @@ return [
        ],
    ],



    'router' => [
        'routes' => [
            'contenu' => [
+1 −21
Original line number Diff line number Diff line
@@ -58,26 +58,6 @@ return [
        ],
    ],

    'navigation' => [
        'default' => [
            'home' => [
                'pages' => [
                    'administration' => [
                        'pages' => [
                            'macro' => [
                                'label' => 'Macros',
                                'route' => 'contenu/macro',
                                'resource' => PrivilegeController::getResourceId(MacroController::class, 'index'),
                                'order'    => 10100,
                                'icon' => 'fas fa-angle-right',
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],

      'router' => [
        'routes' => [
            'contenu' => [
+0 −20
Original line number Diff line number Diff line
@@ -47,26 +47,6 @@ return [
        ],
    ],

    'navigation' => [
        'default' => [
            'home' => [
                'pages' => [
                    'administration' => [
                        'pages' => [
                            'rendu' => [
                                'label' => 'Contenus',
                                'route' => 'contenu/rendu',
                                'resource' => PrivilegeController::getResourceId(RenduController::class, 'index'),
                                'order'    => 10300,
                                'icon' => 'fas fa-angle-right',
                            ],
                        ],
                    ],
                ],
            ],
        ],
    ],

    'router' => [
        'routes' => [
            'contenu' => [
+0 −20
Original line number Diff line number Diff line
@@ -66,26 +66,6 @@ return [
        ],
    ],

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

    'router' => [
        'routes' => [
            'contenu' => [
Loading