Merge branch '5.x' into release/8.0-perimetres (c1cb918a) · Commits · lib / unicaen / privilege

config/unicaen-perimetre.global.php.dist

+26 −15

Changes for config/unicaen-perimetre.global.php.dist: 26 added lines, 15 removed lines.
Original line number	Diff line number	Diff line
		@@ -5,34 +5,34 @@ use UnicaenPrivilege\Provider\Privilege\PerimetrePrivileges;


		$settings = [
		'unicaen-auth' => [
		'enable_perimetres' => false,
		],
		];

		if ($settings['unicaen-auth']['enable_perimetres']) {
		$perimetres = [
		'unicaen-auth' => [
		/**
		* L'entité associée aux périmètres peut être spécifiée via la clef de configuration ['unicaen_auth']['perimetre_entity_class']
		* Si elle est manquante alors la classe @see \UnicaenPrivilege\Entity\Db\Perimetre est utilisée
		* NB: la classe spécifiée doit hériter de @see \UnicaenPrivilege\Entity\Db\AbstractPerimetre
		*/
		'perimetre_entity_class' => Perimetre::class,

		'enable_perimetres' => false,
		];

		$config = [
		'unicaen-auth' => $settings,
		];

		if ($settings['enable_perimetres']) {
		$perimetres = [
		],

		'unicaen-perimetre' => [
		/**
		* Liste des assertions utilisées et des services associés.
		*
		* Important :
		* - le nom de l'assertion au niveau des routes doit respecter le format 'Perimetre\\<nom_de_l_assertion>'
		* (ex : 'assertion' => 'Perimetre\\Structure')
		* - le nom de l'assertion au niveau des routes doit respecter le format 'Perimetre\\<nom_de_l_assertion>' (ex : 'assertion' => 'Perimetre\\Structure')
		* - le service associé doit hériter de @see \UnicaenPrivilege\Assertion\Perimetre\AbstractPerimetreAssertion
		*/
		'assertions' => [
		// 'Structure' => StructureAssertion::class,
		/** Exemple :
		* 'Structure' => StructureAssertion::class,
		*/
		],
		],

		@@ -40,11 +40,22 @@ if ($settings['enable_perimetres']) {
		'default' => [
		'home' => [
		'pages' => [
		// Pour les anciennes applications qui avaient besoin de la route "droits"
		'droits' => [
		'label' => "Droits",
		'title' => "Droits",
		'route' => 'unicaen-perimetre',
		'visible' => false,
		],
		// Pour les nouvelles applications qui utilisent la route "administration"
		'administration' => [
		'label' => "Administration",
		'title' => "Administration",
		'route' => "unicaen-perimetre",
		'pages' => [
		[
		'label' => "Gérer les périmètres",
		'title' => "Gérer les périmetres",
		'title' => "Gérer les périmètres",
		'route' => 'unicaen-perimetre',
		'resource' => PerimetrePrivileges::getResourceId(PerimetrePrivileges::CONSULTER),
		],
		@@ -59,4 +70,4 @@ if ($settings['enable_perimetres']) {
		$perimetres = [];
		}

		return array_merge_recursive($config, $perimetres);
		No newline at end of file
		return array_merge_recursive($settings, $perimetres);
		No newline at end of file

config/unicaen-privilege.global.php.dist

+2 −3

Changes for config/unicaen-privilege.global.php.dist: 2 added lines, 3 removed lines.
Original line number	Diff line number	Diff line
		<?php

		use UnicaenPrivilege\Entity\Db\Perimetre;
		use UnicaenPrivilege\Entity\Db\Privilege;
		use UnicaenPrivilege\Provider\Privilege\PrivilegePrivileges;
		use UnicaenPrivilege\Provider\Rule\PrivilegeRuleProvider;
		@@ -45,8 +44,8 @@ if ($settings['unicaen-auth']['enable_privileges']) {
		'pages' => [
		// Pour les anciennes applications qui avaient besoin de la route "droits"
		'droits' => [
		'label' => "Droit",
		'title' => "Droit",
		'label' => "Droits",
		'title' => "Droits",
		'route' => "unicaen-privilege",
		'visible' => false,
		],

src/UnicaenPrivilege/Controller/PrivilegeController.php

+1 −1

Changes for src/UnicaenPrivilege/Controller/PrivilegeController.php: 1 added line, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@ class PrivilegeController extends AbstractActionController
		$privilegesByCategorie = $this->privilegeService->listByCategorie($namespace);

		$title = "Attribution des privilèges";
		return compact('title', 'form', 'roles', 'privilegesByCategorie');
		return compact('title', 'form', 'roles', 'privilegesByCategorie', 'namespace');
		}

		public function ajouterAction() : ViewModel