Merge branch 'master' into bg-php8 (dd96b1d8) · Commits · lib / unicaen / renderer

.gitignore

0 → 100644

+3 −0

+2 −2

Changes for Module.php: 2 added lines, 2 removed lines.
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',

+0 −1

Changes for composer.json: 0 added lines, 1 removed line.
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

Changes for config/merged/index.config.php: 1 added line, 19 removed lines.
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' => [

+3 −6

Changes for config/merged/macro.config.php: 3 added lines, 6 removed lines.
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',
		],
		],
		],