Changement dans les menus (187c6a8d) · Commits · open-source / emc2

module/Application/config/merged/menu.config.php

+45 −36

Changes for module/Application/config/merged/menu.config.php: 45 added lines, 36 removed lines.
Original line number	Diff line number	Diff line
		@@ -2,58 +2,67 @@

		namespace Application;

		use Application\Controller\RessourceRh\RessourceRhController;
		use Application\Provider\Privilege\ActivitePrivileges;
		use Application\Provider\Privilege\AffectationPrivileges;
		use Application\Provider\Privilege\ApplicationPrivileges;
		use Application\Provider\Privilege\FicheMetierPrivileges;
		use Application\Provider\Privilege\RessourceRhPrivileges;
		use Application\Provider\Privilege\UtilisateurPrivileges;
		use Mailing\Provider\Privilege\MailingPrivileges;


		return [
		'navigation' => [
		'default' => [
		'home' => [
		'pages' => [
		'droits' => [
		'visible' => false,
		],
		'ressource' => [
		'order' => 100,
		'label' => 'Ressources RH',
		'route' => 'ressource-rh',
		'roles' => [],
		'pages' => [
		// [
		// 'label' => 'Status',
		// 'route' => 'ressource-rh',
		// 'privileges' => RessourceRhPrivileges::AFFICHER,
		// 'dropdown-header' => true,
		// 'icon' => 'fas fa-angle-right'
		// ],
		// [
		// 'label' => 'Correspondances',
		// 'route' => 'ressource-rh',
		// 'privileges' => RessourceRhPrivileges::AFFICHER,
		// 'dropdown-header' => true,
		// 'icon' => 'fas fa-angle-right'
		// ],
		// [
		// 'label' => 'Métiers',
		// 'route' => 'ressource-rh',
		// 'privileges' => RessourceRhPrivileges::AFFICHER,
		// 'dropdown-header' => true,
		// 'icon' => 'fas fa-angle-right'
		// ],
		// [
		// 'label' => 'Corps',
		// //'route' => 'ressource-rh',
		// 'module' => 'Application',
		// 'controller' => RessourceRhController::class,
		// 'action' => 'creer-corps',
		// 'rel' => [
		// 'id' => '1',
		// ],
		// 'privileges' => RessourceRhPrivileges::AFFICHER,
		// 'dropdown-header' => true,
		// 'icon' => 'fas fa-angle-right'
		// ],
		],
		],
		'administration-preecog' => [
		'order' => 1000,
		'label' => 'Administration',
		'title' => "Administration",
		'route' => 'administration',
		'roles' => [],
		'pages' => [
		[
		'label' => 'Mailing',
		'route' => 'mailing',
		'roles' => [], //'privileges' => MailingPrivileges::AFFICHER,
		'dropdown-header' => true,
		'icon' => 'fas fa-angle-right'
		],
		[
		'label' => 'Utilisateurs',
		'route' => 'utilisateur',
		'roles' => [],// 'privileges' => UtilisateurPrivileges::AFFICHER,
		'dropdown-header' => true,
		'icon' => 'fas fa-angle-right',
		],
		'roles' => [
		'label' => "Rôles",
		'title' => "Gestion des rôles",
		'route' => 'droits/roles',
		'resource' => \UnicaenAuth\Guard\PrivilegeController::getResourceId('UnicaenAuth\Controller\Droits', 'roles'),
		'withtarget' => true,
		'icon' => 'fas fa-angle-right'
		],
		'privileges' => [
		'label' => "Privilèges",
		'title' => "Gestion des privilèges",
		'route' => 'droits/privileges',
		'resource' => \UnicaenAuth\Guard\PrivilegeController::getResourceId('UnicaenAuth\Controller\Droits', 'privileges'),
		'withtarget' => true,
		'icon' => 'fas fa-angle-right'
		],
		],
		],
		'fiche-metier' => [

module/Application/config/merged/utilisateur.config.php

+0 −48

Changes for module/Application/config/merged/utilisateur.config.php: 0 added lines, 48 removed lines.
Original line number	Diff line number	Diff line
		@@ -136,54 +136,6 @@ return [
		],
		],

		'navigation' => [
		'default' => [
		'home' => [
		'pages' => [
		'administration' => [
		'order' => 90,
		'label' => 'Administration',
		'title' => "Administration",
		'route' => 'utilisateur',
		'roles' => [], //PrivilegeController::getResourceId(__NAMESPACE__ . '\Controller\Administration', 'index'),
		'pages' => [
		[
		'label' => "Droits et privilèges",
		'route' => 'droits',
		'roles' => [],//'resource' => PrivilegeController::getResourceId('UnicaenAuth\Controller\Droits', 'index'),
		'dropdown-header' => true,
		'icon' => 'fas fa-user',
		],
		[
		'label' => "Gérer les rôles",
		'title' => "Gérer les rôles",
		'route' => 'droits/roles',
		'action' => 'roles',
		'roles' => [],//'resource' => PrivilegeController::getResourceId('UnicaenAuth\Controller\Droits', 'roles'),
		'icon' => 'fas fa-angle-right',
		],
		[
		'label' => "Gérer les privilèges",
		'title' => "Gérer les privilèges",
		'route' => 'droits/privileges',
		'action' => 'privileges',
		'resource' => PrivilegeController::getResourceId('UnicaenAuth\Controller\Droits', 'privileges'),
		'icon' => 'fas fa-angle-right',
		],
		[
		'label' => 'Logs',
		'route' => 'journal',
		'resource' => PrivilegeController::getResourceId(__NAMESPACE__ . '\Controller\Journal', 'index'),
		'dropdown-header' => true,
		'icon' => 'fas fa-archive'
		],
		],
		],
		],
		],
		],
		],

		'service_manager' => [
		'factories' => [
		UserService::class => UserServiceFactory::class,

module/Application/config/module.config.php

+11 −4

Changes for module/Application/config/module.config.php: 11 added lines, 4 removed lines.
Original line number	Diff line number	Diff line
		@@ -4,8 +4,6 @@ namespace Application;

		use Application\Service\Affectation\AffectationService;
		use Application\Service\Affectation\AffectationServiceFactory;
		use Application\Service\MailService\MailService;
		use Application\Service\MailService\MailServiceFactory;
		use Application\Service\Role\RoleService;
		use Application\Service\Role\RoleServiceFactory;
		use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
		@@ -56,20 +54,29 @@ return [
		],
		'may_terminate' => true,
		],
		'administration' => [
		'type' => Literal::class,
		'options' => [
		'route' => '/administration',
		'defaults' => [
		'controller' => 'Application\Controller\Index', // <-- change here
		'action' => 'administration',
		],
		],
		'may_terminate' => true,
		],
		],
		],
		'service_manager' => [
		'invokables' => [
		],
		'factories' => [
		MailService::class => MailServiceFactory::class,
		RoleService::class => RoleServiceFactory::class,
		AffectationService::class => AffectationServiceFactory::class,
		],
		],
		'controllers' => [
		'invokables' => [
		//'Application\Controller\Index' => Controller\IndexController::class,
		],
		'factories' => [
		'Application\Controller\Index' => Controller\IndexControllerFactory::class,

module/Application/src/Application/Controller/IndexController.php

+2 −7

Changes for module/Application/src/Application/Controller/IndexController.php: 2 added lines, 7 removed lines.
Original line number	Diff line number	Diff line
		@@ -26,12 +26,7 @@ class IndexController extends AbstractActionController
		]);
		}

		public function creerAction()
		{
		$activite = new Activite();

		return new ViewModel([

		]);
		public function administrationAction() {
		return new ViewModel();
		}
		}

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

0 → 100644

+3 −0

Changes for module/Application/view/application/index/administration.phtml: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		<h1 class="page-header">
		Administration
		</h1>
		No newline at end of file