Refactoring des fichiers de configuration (0ffcd74a) · Commits · open-source / emc2

config/autoload/README.md

deleted100755 → 0

+0 −8

Changes for config/autoload/README.md: 0 added lines, 8 removed lines.
Original line number	Diff line number	Diff line
		About this directory:
		=====================

		By default, this application is configured to load all configs in
		`./config/autoload/{,*.}{global,local}.php`. Doing this provides a
		location for a developer to drop in configuration override files provided by
		modules, as well as cleanly provide individual, application-wide config files
		for things like database connections, etc.

module/Application/config/merged/fiche-metier.config.php

0 → 100644

+110 −0

Changes for module/Application/config/merged/fiche-metier.config.php: 110 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<?php

		namespace Application;

		use Application\Controller\FicheMetier\FicheMetierController;
		use Application\Controller\FicheMetier\FicheMetierControllerFactory;
		use Application\Provider\Privilege\FicheMetierPrivileges;
		use Application\Service\FicheMetier\FicheMetierService;
		use Application\Service\FicheMetier\FicheMetierServiceFactory;
		use UnicaenAuth\Guard\PrivilegeController;
		use Zend\Mvc\Router\Http\Literal;
		use Zend\Mvc\Router\Http\Segment;

		return [
		'bjyauthorize' => [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => FicheMetierController::class,
		'action' => [
		'index',
		],
		'roles' => [
		],
		],
		[
		'controller' => FicheMetierController::class,
		'action' => [
		'afficher',
		],
		'privileges' => [
		FicheMetierPrivileges::AFFICHER,
		],
		],
		[
		'controller' => FicheMetierController::class,
		'action' => [
		'historiser',
		'restaurer',
		],
		'privileges' => [
		FicheMetierPrivileges::HISTORISER,
		],
		],
		],
		],
		],

		'router' => [
		'routes' => [
		'fiche-metier' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/fiche-metier',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		'child_routes' => [
		'afficher' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/afficher/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'afficher',
		],
		],
		'may_terminate' => true,
		],
		'historiser' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/historiser/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'historiser',
		],
		],
		],
		'restaurer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/restaurer/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'restaurer',
		],
		],
		],
		],
		],
		],
		],

		'service_manager' => [
		'invokables' => [
		],
		'factories' => [
		FicheMetierService::class => FicheMetierServiceFactory::class,
		],
		],
		'controllers' => [
		'factories' => [
		FicheMetierController::class => FicheMetierControllerFactory::class,
		]
		],
		];
		No newline at end of file

module/Application/config/module.config.php

+2 −82

Changes for module/Application/config/module.config.php: 2 added lines, 82 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,11 +2,6 @@

		namespace Application;

		use Application\Controller\FicheMetier\FicheMetierController;
		use Application\Controller\FicheMetier\FicheMetierControllerFactory;
		use Application\Provider\Privilege\FicheMetierPrivileges;
		use Application\Service\FicheMetier\FicheMetierService;
		use Application\Service\FicheMetier\FicheMetierServiceFactory;
		use Application\Service\MailService\MailService;
		use Application\Service\MailService\MailServiceFactory;
		use Application\Service\Role\RoleService;
		@@ -15,40 +10,11 @@ use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
		use Doctrine\ORM\Mapping\Driver\XmlDriver;
		use UnicaenAuth\Guard\PrivilegeController;
		use Zend\Mvc\Router\Http\Literal;
		use Zend\Mvc\Router\Http\Segment;

		return [
		'bjyauthorize' => [
		'guards' => [
		PrivilegeController::class => [
		[
		'controller' => FicheMetierController::class,
		'action' => [
		'index',
		],
		'roles' => [
		],
		],
		[
		'controller' => FicheMetierController::class,
		'action' => [
		'afficher',
		],
		'privileges' => [
		FicheMetierPrivileges::AFFICHER,
		],
		],
		[
		'controller' => FicheMetierController::class,
		'action' => [
		'historiser',
		'restaurer',
		],
		'privileges' => [
		FicheMetierPrivileges::HISTORISER,
		],
		],
		],
		PrivilegeController::class => [],
		],
		],

		@@ -88,57 +54,12 @@ return [
		],
		'may_terminate' => true,
		],
		'fiche-metier' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/fiche-metier',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'index',
		],
		],
		'may_terminate' => true,
		'child_routes' => [
		'afficher' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/afficher/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'afficher',
		],
		],
		'may_terminate' => true,
		],
		'historiser' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/historiser/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'historiser',
		],
		],
		],
		'restaurer' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/restaurer/:id',
		'defaults' => [
		'controller' => FicheMetierController::class,
		'action' => 'restaurer',
		],
		],
		],
		],
		],
		],
		],
		'service_manager' => [
		'invokables' => [
		],
		'factories' => [
		FicheMetierService::class => FicheMetierServiceFactory::class,
		MailService::class => MailServiceFactory::class,
		RoleService::class => RoleServiceFactory::class,
		],
		@@ -148,16 +69,15 @@ return [
		'Application\Controller\Index' => Controller\IndexController::class,
		],
		'factories' => [
		FicheMetierController::class => FicheMetierControllerFactory::class,
		]
		],

		'view_manager' => [
		'template_path_stack' => [
		__DIR__ . '/../view',
		],
		],


		'translator' => [
		'locale' => 'fr_FR', // en_US
		'translation_file_patterns' => [

module/Application/src/Application/Entity/Db/Role.php

+3 −2

Changes for module/Application/src/Application/Entity/Db/Role.php: 3 added lines, 2 removed lines.
Original line number	Diff line number	Diff line
		@@ -9,8 +9,9 @@ use UnicaenAuth\Entity\Db\UserInterface;
		*/
		class Role extends AbstractRole
		{
		const ADMIN_TECH = 'ADMIN_TECH';
		const ADMIN_FONC = 'ADMIN_FONC';
		const ADMIN_TECH = 'Administrateur technique';
		const ADMIN_FONC = 'Administrateur fonctionnel';
		const UTILISATEUR = 'Utilisateur';

		/** @var \Doctrine\Common\Collections\Collection */
		private $privilege;

module/Application/view/application/utilisateur/index.phtml

+2 −7

Changes for module/Application/view/application/utilisateur/index.phtml: 2 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -112,15 +112,10 @@ $canRole = $this->isAllowed(UtilisateurPrivileges::getResourceId(Utilisat
		<div id="affecte_<?php echo $role->getId(); ?>"
		style="<?php if (array_search($role,$rolesDisponibles)!== false) echo 'display:none;'; ?>"
		>
		<!-- --><?php
		// $canRole = false;
		// if ($role->getRoleId() == Role::ADMIN_TECH) $canRole = true;//$this->isAllowed(Privileges::getResourceId(Privileges::DROIT_REDACTEUR));
		// if ($role->getRoleId() == Role::ADMIN_FONC) $canRole = true;//$this->isAllowed(Privileges::getResourceId(Privileges::DROIT_VALIDATEUR));
		// ?>
		<?php if ($canRole): ?>
		<span id="<?php echo $utilisateur->getId().'_'.$role->getId(); ?>"
		style="color:red;"
		class="remove-role glyphicon glyphicon-minus">
		class="remove-role glyphicon glyphicon-minus-sign pointer">
		</span>
		<?php endif; ?>
		<?php echo $role->getRoleId(); ?>
		@@ -143,7 +138,7 @@ $canRole = $this->isAllowed(UtilisateurPrivileges::getResourceId(Utilisat
		<?php if ($canRole): ?>
		<span id="<?php echo $utilisateur->getId().'_'.$role->getId(); ?>"
		style="color:green;"
		class="add-role glyphicon glyphicon-plus">
		class="add-role glyphicon glyphicon-plus-sign pointer">
		</span>
		<?php endif; ?>
		<?php echo $role->getRoleId(); ?>