Merge branch 'features_gestion_utilisateur_particulier' (2287836b) · Commits · open-source / sygal

CHANGELOG.md

+10 −0

Original line number	Diff line number	Diff line
		Journal des modifications
		=========================

		1.3.3 (18/12/2019)
		------------------

		### Ajouts

		- Gestion des directeurs sans SUPANN_ID
		- Création de compte associé aux individus
		- Réinitialisation de mot de passe
		- Changement de l'affichage des warning associés

		1.3.2 (27/11/2019)
		------------------

config/autoload/version.global.php

+3 −3

Original line number	Diff line number	Diff line
		@@ -2,9 +2,9 @@
		return [
		'unicaen-app' => [
		'app_infos' => [
		'version' => '1.3.2',
		'date' => '27/11/2019',
		'version' => '1.3.3',
		'date' => '18/12/2019',
		],
		],
		'comment' => 'Fichier généré le 27/11/2019 à 13:39:25 avec /home/metivier/MyWeb/sygal/bump-version',
		'comment' => 'Fichier généré le 18/12/2019 à 11:49:34 avec /home/metivier/MyWeb/sygal/bump-version',
		];

doc/release-notes/v1.3.3.md

0 → 100644

+23 −0

Original line number	Diff line number	Diff line
		# Version 1.3.3

		## 1. Sur le serveur d'application

		- Placez-vous dans le répertoire de l'application puis lancez la commande suivante
		pour installer la nouvelle version :

		```bash
		git fetch --tags && git checkout --force 1.3.3 && \
		bash ./install.sh
		```

		- Selon le moteur PHP que vous avez installé, rechargez le service, exemple :
		- php7.0-fpm : `service php7.0-fpm reload`
		- apache2-mod-php7.0 : `service apache2 reload`

		## 2. Dans la base de données

		Nouveau privilege

		```SQL
		INSERT INTO PRIVILEGE (CATEGORIE_ID, CODE, LIBELLE, ORDRE) VALUES (5, 'create_from_individu', 'Créer un utilisateur à partir d''un individu', 100);
		```
		No newline at end of file

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

+59 −4

Original line number	Diff line number	Diff line
		@@ -6,13 +6,15 @@ use Application\Form\CreationUtilisateurFromIndividuForm;
		use Application\Form\Factory\CreationUtilisateurFormFactory;
		use Application\Form\Factory\CreationUtilisateurFromIndividuFormFactory;
		use Application\Form\Factory\CreationUtilisateurHydratorFactory;
		use Application\Form\Factory\InitCompteFormFactory;
		use Application\Form\Hydrator\CreationUtilisateurHydrator;
		use Application\Form\InitCompteForm;
		use Application\Form\Validator\Factory\NewEmailValidatorFactory;
		use Application\Form\Validator\NewEmailValidator;
		use Application\Form\Validator\PasswordValidator;
		use Application\Provider\Privilege\UtilisateurPrivileges;
		use Application\Service\Individu\IndividuServiceFactory;
		use Application\Service\Utilisateur\UtilisateurService;
		use Application\Service\Utilisateur\UtilisateurServiceFactory;
		use Application\View\Helper\IndividuUsurpationHelperFactory;
		use UnicaenAuth\Guard\PrivilegeController;
		use Zend\Mvc\Router\Http\Literal;
		@@ -46,6 +48,22 @@ return [
		],
		'privileges' => UtilisateurPrivileges::UTILISATEUR_MODIFICATION,
		],
		[
		'controller' => 'Application\Controller\Utilisateur',
		'action' => [
		'gerer-utilisateur',
		'creer-compte-local-individu',
		'reset-password',
		],
		'privileges' => UtilisateurPrivileges::UTILISATEUR_CREATE_FROM_INDIVIDU,
		],
		[
		'controller' => 'Application\Controller\Utilisateur',
		'action' => [
		'init-compte',
		],
		'roles' => [],
		],
		],
		],
		],
		@@ -74,6 +92,15 @@ return [
		],
		],
		],
		'gerer-utilisateur' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/gerer-utilisateur/:individu',
		'defaults' => [
		'action' => 'gerer-utilisateur',
		],
		],
		],
		'ajouter-pour-individu' => [
		'type' => Segment::class,
		'options' => [
		@@ -83,6 +110,33 @@ return [
		],
		],
		],
		'creer-compte-local-individu' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/creer-compte-local-individu/:individu',
		'defaults' => [
		'action' => 'creer-compte-local-individu',
		],
		],
		],
		'reset-password' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/reset-password/:individu',
		'defaults' => [
		'action' => 'reset-password',
		],
		],
		],
		'init-compte' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/init-compte/:token',
		'defaults' => [
		'action' => 'init-compte',
		],
		],
		],
		'rechercher-people' => [
		'type' => Segment::class,
		'options' => [
		@@ -151,11 +205,11 @@ return [
		],
		],
		'service_manager' => [
		'invokables' => array(
		'UtilisateurService' => UtilisateurService::class,
		),
		'invokables' => [
		],
		'factories' => [
		'IndividuService' => IndividuServiceFactory::class,
		'UtilisateurService' => UtilisateurServiceFactory::class,
		],
		],
		'controllers' => [
		@@ -167,6 +221,7 @@ return [
		],
		'form_elements' => [
		'factories' => [
		InitCompteForm::class => InitCompteFormFactory::class,
		CreationUtilisateurForm::class => CreationUtilisateurFormFactory::class,
		CreationUtilisateurFromIndividuForm::class => CreationUtilisateurFromIndividuFormFactory::class,
		]

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -11,6 +11,7 @@ use Application\Service\Role\RoleService;
		use Application\Service\These\TheseRechercheService;
		use Application\Service\These\TheseService;
		use Application\Service\UniteRecherche\UniteRechercheService;
		use Application\Service\Utilisateur\UtilisateurService;
		use Application\Service\Validation\ValidationService;
		use Application\Service\Variable\VariableService;
		use Application\Service\VersionFichier\VersionFichierService;
		@@ -50,6 +51,7 @@ class TheseControllerFactory
		* @var MailConfirmationService $mailConfirmationService
		* @var EntityManager $entityManager
		* @var ImportService $importService
		* @var UtilisateurService $utilisateurService
		*/
		$variableService = $sl->get('VariableService');
		$validationService = $sl->get('ValidationService');
		@@ -65,6 +67,7 @@ class TheseControllerFactory
		$entityManager = $sl->get('doctrine.entitymanager.orm_default');
		$notifierService = $sl->get(NotifierService::class);
		$importService = $sl->get('ImportService');
		$utilisateurService = $sl->get('UtilisateurService');

		$controller = new TheseController();
		$controller->setTimeoutRetraitement($this->getTimeoutRetraitementFromOptions($options));
		@@ -82,6 +85,7 @@ class TheseControllerFactory
		$controller->setEntityManager($entityManager);
		$controller->setNotifierService($notifierService);
		$controller->setImportService($importService);
		$controller->setUtilisateurService($utilisateurService);

		/**
		* @var SourceCodeStringHelper $sourceCodeHelper