Merge branch 'feature_page_utilisateurs' into release-2.1.5 (1533d6a9) · Commits · open-source / sygal

composer.lock

+3 −3

Original line number	Diff line number	Diff line
		@@ -3395,11 +3395,11 @@
		},
		{
		"name": "unicaen/auth",
		"version": "3.1.1",
		"version": "3.1.2",
		"source": {
		"type": "git",
		"url": "https://git.unicaen.fr/lib/unicaen/auth.git",
		"reference": "effca5ffd8d95173867c682dde70b523b0656c1e"
		"reference": "f20a38745c469ebe7283bf0bde194ee31728f201"
		},
		"require": {
		"jasig/phpcas": "^1.3",
		@@ -3421,7 +3421,7 @@
		]
		},
		"description": "Module d'authentification pour les applications Unicaen",
		"time": "2021-02-01T11:10:43+00:00"
		"time": "2021-02-09T17:17:53+00:00"
		},
		{
		"name": "unicaen/bjy-authorize",

module/Application/config/module.config.php

+3 −1

Original line number	Diff line number	Diff line
		@@ -21,6 +21,7 @@ use Application\Service\Url\UrlServiceFactory;
		use Application\Service\UserContextServiceAwareInitializer;
		use Application\Service\UserContextServiceFactory;
		use Application\View\Helper\EscapeTextHelper;
		use Application\View\Helper\FiltersPanel\FiltersPanelHelper;
		use Application\View\Helper\Sortable;
		use Application\View\Helper\SortableHelperFactory;
		use Application\View\Helper\Uploader\UploaderHelper;
		@@ -273,7 +274,8 @@ return array(
		'view_helpers' => array(
		'invokables' => array(
		'filterPanel' => 'Application\View\Helper\FilterPanel\FilterPanelHelper',
		'selectsFilterPanel' => \Application\View\Helper\SelectsFilterPanel\SelectsFilterPanelHelper::class,
		'selectsFilterPanel' => FiltersPanelHelper::class,
		'filtersPanel' => FiltersPanelHelper::class,
		'escapeText' => EscapeTextHelper::class,
		),
		'factories' => array(

module/Application/config/others/utilisateur.config.php

+24 −4

Original line number	Diff line number	Diff line
		<?php

		namespace Application;

		use Application\Controller\Factory\UtilisateurControllerFactory;
		use Application\Form\CreationUtilisateurForm;
		use Application\Form\CreationUtilisateurFromIndividuForm;
		@@ -14,6 +16,8 @@ use Application\Form\Validator\NewEmailValidator;
		use Application\Form\Validator\PasswordValidator;
		use Application\Provider\Privilege\UtilisateurPrivileges;
		use Application\Service\Individu\IndividuServiceFactory;
		use Application\Service\Utilisateur\UtilisateurSearchService;
		use Application\Service\Utilisateur\UtilisateurSearchServiceFactory;
		use Application\Service\Utilisateur\UtilisateurService;
		use Application\Service\Utilisateur\UtilisateurServiceFactory;
		use Application\View\Helper\IndividuUsurpationHelperFactory;
		@@ -35,6 +39,7 @@ return [
		'controller' => 'Application\Controller\Utilisateur',
		'action' => [
		'index',
		'voir',
		'rechercher-people',
		'rechercher-individu',
		],
		@@ -92,6 +97,15 @@ return [
		],
		'may_terminate' => true,
		'child_routes' => [
		'voir' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/voir/:utilisateur',
		'defaults' => [
		'action' => 'voir',
		],
		],
		],
		'ajouter' => [
		'type' => Literal::class,
		'options' => [
		@@ -197,15 +211,20 @@ return [
		'label' => 'Utilisateurs',
		'route' => 'utilisateur',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Utilisateur', 'index'),

		'icon' => 'fa fa-users',
		'order' => 60,
		'pages' => [
		'voir' => [
		'label' => "Détails",
		'route' => 'utilisateur/voir',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Utilisateur', 'index'),
		],
		'creation' => [
		'label' => "Création d'utilisateur",
		'label' => "Création",
		'route' => 'utilisateur/ajouter',
		'resource' => PrivilegeController::getResourceId('Application\Controller\Utilisateur', 'ajouter'),

		'order' => 50,
		],
		],
		],
		],
		],
		@@ -219,6 +238,7 @@ return [
		'factories' => [
		'IndividuService' => IndividuServiceFactory::class,
		'UtilisateurService' => UtilisateurServiceFactory::class,
		UtilisateurSearchService::class => UtilisateurSearchServiceFactory::class,
		],
		'aliases' => [
		UtilisateurService::class => 'UtilisateurService'

module/Application/src/Application/Controller/Factory/UtilisateurControllerFactory.php

+5 −0

Original line number	Diff line number	Diff line
		@@ -14,6 +14,7 @@ use Application\Service\Role\RoleService;
		use Application\Service\Structure\StructureService;
		use Application\Service\UniteRecherche\UniteRechercheService;
		use Application\Service\UserContextService;
		use Application\Service\Utilisateur\UtilisateurSearchService;
		use Application\Service\Utilisateur\UtilisateurService;
		use Application\SourceCodeStringHelper;
		use Doctrine\ORM\EntityManager;
		@@ -42,6 +43,7 @@ class UtilisateurControllerFactory
		* @var NotifierService $notifierService
		* @var UserContextService $userContextService
		* @var UserService $userService
		* @var UtilisateurSearchService $utilisateurSearchService
		*/
		$acteurService = $container->get(ActeurService::class);
		$roleService = $container->get('RoleService');
		@@ -54,6 +56,7 @@ class UtilisateurControllerFactory
		$entityManager = $container->get('doctrine.entitymanager.orm_default');
		$userContextService = $container->get(UserContext::class);
		$userService = $container->get('unicaen-auth_user_service');
		$utilisateurSearchService = $container->get(UtilisateurSearchService::class);

		/**
		* @var InitCompteForm $initCompteForm
		@@ -90,7 +93,9 @@ class UtilisateurControllerFactory
		$controller->setAuthenticationService($authenticationService);
		$controller->setInitCompteForm($initCompteForm);
		$controller->setCreationUtilisateurForm($creationUtilisateurForm);
		$controller->setOptions($authModuleOptions); // requis
		$controller->setAuthModuleOptions($authModuleOptions);
		$controller->setSearchService($utilisateurSearchService);

		/**
		* @var SourceCodeStringHelper $sourceCodeHelper

module/Application/src/Application/Controller/RapportAnnuelRechercheController.php

+7 −26

Original line number	Diff line number	Diff line
		@@ -4,10 +4,8 @@ namespace Application\Controller;

		use Application\Entity\Db\RapportAnnuel;
		use Application\Search\Controller\SearchControllerInterface;
		use Application\Search\Controller\SearchControllerPlugin;
		use Application\Search\SearchServiceAwareTrait;
		use Application\Search\Controller\SearchControllerTrait;
		use Application\Service\Fichier\FichierServiceAwareTrait;
		use Application\Service\RapportAnnuel\RapportAnnuelSearchService;
		use Zend\Http\Response;
		use Zend\Paginator\Paginator as ZendPaginator;
		use Zend\View\Model\ViewModel;
		@@ -17,14 +15,9 @@ use Zend\View\Model\ViewModel;
		*/
		class RapportAnnuelRechercheController extends AbstractController implements SearchControllerInterface
		{
		use SearchServiceAwareTrait;
		use SearchControllerTrait;
		use FichierServiceAwareTrait;

		/**
		* @var RapportAnnuelSearchService
		*/
		protected $searchService;

		/**
		* @return ViewModel\|Response
		*/
		@@ -32,7 +25,7 @@ class RapportAnnuelRechercheController extends AbstractController implements Sea
		{
		$text = $this->params()->fromQuery('text');

		$result = $this->getSearchPluginController()->search();
		$result = $this->search();
		if ($result instanceof Response) {
		return $result;
		}
		@@ -48,9 +41,9 @@ class RapportAnnuelRechercheController extends AbstractController implements Sea
		/**
		* @return ViewModel
		*/
		public function filtersAction()
		public function filtersAction(): ViewModel
		{
		$filters = $this->getSearchPluginController()->filters();
		$filters = $this->filters();

		return new ViewModel([
		'filters' => $filters,
		@@ -61,9 +54,9 @@ class RapportAnnuelRechercheController extends AbstractController implements Sea
		/**
		* @return void\|Response
		*/
		public function telechargerZipAction()
		public function telechargerZipAction(): Response
		{
		$result = $this->getSearchPluginController()->search();
		$result = $this->search();
		if ($result instanceof Response) {
		return $result; // théoriquement, on ne devrait pas arriver ici.
		}
		@@ -81,16 +74,4 @@ class RapportAnnuelRechercheController extends AbstractController implements Sea
		$fichierZip = $this->fichierService->compresserFichiers($fichiers);
		$this->fichierService->telechargerFichier($fichierZip);
		}

		/**
		* @return SearchControllerPlugin
		*/
		protected function getSearchPluginController()
		{
		/** @var SearchControllerPlugin $searchControllerPlugin */
		$searchControllerPlugin = $this->getPluginManager()->get('searchControllerPlugin');
		$searchControllerPlugin->setSearchService($this->searchService);

		return $searchControllerPlugin;
		}
		}
		No newline at end of file