Merge branch 'feature_saisie_consentement' into release_5.2.7 (c0575994) · Commits · open-source / sygal

CHANGELOG.md

+2 −0

Original line number	Diff line number	Diff line
		@@ -8,6 +8,8 @@ Journal des modifications
		- Extraction d'un module Depot (dépôt du manuscrit de thèse).
		- Amélioration de l'index doctorant du module formation
		- Ajout de la possibilité d'enregistrer et de valider l'enquête de retour de formation
		- Doctorant : peut refuser de recevoir sur son adresse électronique de contact les messages des listes de diffusion
		- Suppression du menu 'Mes données' : la modif de l'adresse de contact et du consentement associé est désormais sur la fiche Thèse
		- [FIX] Retrait de la liste complémentaire du mail d'echec
		- [FIX] Ordonnancement des séances sur les index des formations et des sessions
		- [FIX] Correction paramètre de route erronée + suppression bouton inactif

doc/release-notes/v5.2.7.md

+6 −0

Original line number	Diff line number	Diff line
		@@ -25,4 +25,10 @@ INSERT INTO nature_fichier (id, code, libelle) select nextval('nature_fichier_id
		INSERT INTO nature_fichier (id, code, libelle) select nextval('nature_fichier_id_seq'), 'CHARTE_DOCTORAT', 'Charte du doctorat';
		INSERT INTO nature_fichier (id, code, libelle) select nextval('nature_fichier_id_seq'), 'CHARTE_DOCTORAT_AVENANT', 'Avenant à la charte du doctorat';
		update nature_fichier set code = 'CONV_MISE_EN_LIGNE_AVENANT' where code = 'AVENANT_CONV_MISE_EN_LIGNE';

		update privilege set code = 'modifier-email-contact', libelle = 'Modifier l''email de contact du doctorant' where code = 'modification-persopass';
		update privilege set code = 'afficher-email-contact', libelle = 'Visualiser l''email de contact du doctorant' where code = 'afficher-mail-contact';

		alter table mail_confirmation add refus_liste_diff boolean default false not null;
		comment on column mail_confirmation.refus_liste_diff is 'Refus de recevoir les messages des listes de diffusion sur cette adresse';
		```

module/Application/Module.php

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@ class Module
		);

		/* Détournement de requête pour demander la saisie du persopass */
		$deflector = new SaisiePersopassRouteDeflector('#^home\|these\|soutenance\/.+#', [
		$deflector = new SaisieEmailContactRouteDeflector('#^home\|these\|soutenance\|formation\/.+#', [
		'options' => ['name' => 'doctorant/modifier-email-contact'],
		'params' => ['detournement' => 1]
		]);

module/Application/config/module.config.php

+5 −5

Original line number	Diff line number	Diff line
		@@ -7,9 +7,6 @@ use Application\Cache\MemcachedFactory;
		use Application\Controller\Factory\IndexControllerFactory;
		use Application\Controller\Plugin\Forward;
		use Application\Controller\Plugin\ForwardFactory;
		use Application\ORM\Query\Functions\ToNumber;
		use Application\ORM\Query\Functions\Year;
		use Fichier\Controller\Plugin\Uploader\UploaderPluginFactory;
		use Application\Entity\Db\Repository\DefaultEntityRepository;
		use Application\Entity\UserWrapperFactory;
		use Application\Entity\UserWrapperFactoryFactory;
		@@ -17,6 +14,8 @@ use Application\Event\UserAuthenticatedEventListenerFactory;
		use Application\Event\UserRoleSelectedEventListener;
		use Application\Navigation\NavigationFactoryFactory;
		use Application\ORM\Query\Functions\StrReduce;
		use Application\ORM\Query\Functions\ToNumber;
		use Application\ORM\Query\Functions\Year;
		use Application\Service\AuthorizeServiceAwareInitializer;
		use Application\Service\Role\RoleService;
		use Application\Service\Role\RoleServiceFactory;
		@@ -29,11 +28,12 @@ use Application\View\Helper\EscapeTextHelper;
		use Application\View\Helper\FiltersPanel\FiltersPanelHelper;
		use Application\View\Helper\Sortable;
		use Application\View\Helper\SortableHelperFactory;
		use Fichier\View\Helper\Uploader\UploaderHelper;
		use Fichier\View\Helper\Uploader\UploaderHelperFactory;
		use Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain;
		use Doctrine\DBAL\Driver\PDO\PgSQL\Driver as PgSQL;
		use Doctrine\ORM\Mapping\Driver\XmlDriver;
		use Fichier\Controller\Plugin\Uploader\UploaderPluginFactory;
		use Fichier\View\Helper\Uploader\UploaderHelper;
		use Fichier\View\Helper\Uploader\UploaderHelperFactory;
		use Laminas\Navigation\Navigation;
		use Structure\Form\Factory\EcoleDoctoraleFormFactory;
		use UnicaenApp\Controller\ConsoleController;

module/Application/config/others/admin.config.php

+5 −112

Original line number	Diff line number	Diff line
		<?php

		use Application\Controller\AdminController;
		use Application\Controller\Factory\MailConfirmationControllerFactory;
		use Application\Controller\Factory\PrivilegeControllerFactory;
		use Application\Controller\Factory\RoleControllerFactory;
		use Application\Controller\MailConfirmationController;
		use Application\Controller\RoleController;
		use Application\Form\Factory\MailConfirmationFormFactory;
		use Application\Form\Factory\MailConfirmationHydratorFactory;
		use Structure\Provider\Privilege\StructurePrivileges;
		use These\Provider\Privilege\ThesePrivileges;
		use Application\Provider\Privilege\UtilisateurPrivileges;
		use Application\Service\MailConfirmationServiceFactory;
		use UnicaenAuth\Guard\PrivilegeController;
		use UnicaenAuth\Provider\Privilege\Privileges;
		use Laminas\Router\Http\Literal;
		use Laminas\Router\Http\Segment;
		use Structure\Provider\Privilege\StructurePrivileges;
		use UnicaenAuth\Guard\PrivilegeController;
		use UnicaenAuth\Provider\Privilege\Privileges;

		return [
		'bjyauthorize' => [
		@@ -68,27 +63,6 @@ return [
		],
		'privileges' => UtilisateurPrivileges::UTILISATEUR_ATTRIBUTION_ROLE,
		],
		[
		'controller' => MailConfirmationController::class,
		'action' => [
		'index',
		'envoie',
		'envoye',
		'reception',
		'swap',
		'remove'
		],
		'privileges' => UtilisateurPrivileges::UTILISATEUR_ATTRIBUTION_ROLE,
		],
		[
		'controller' => MailConfirmationController::class,
		'action' => [
		'envoie',
		'envoye',
		'reception',
		],
		'privileges' => ThesePrivileges::THESE_CONSULTATION_FICHE,
		],
		],
		],
		],
		@@ -148,66 +122,6 @@ return [
		],
		]
		],
		'mail-confirmation-acceuil' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/mail-confirmation-acceuil[/:id]',
		'defaults' =>[
		'controller' => MailConfirmationController::class,
		'action' => 'index',
		],
		],
		],
		'mail-confirmation-swap' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/mail-confirmation-swap/:id',
		'defaults' =>[
		'controller' => MailConfirmationController::class,
		'action' => 'swap',
		],
		],
		],
		'mail-confirmation-remove' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/mail-confirmation-remove/:id',
		'defaults' =>[
		'controller' => MailConfirmationController::class,
		'action' => 'remove',
		],
		],
		],
		'mail-confirmation-envoie' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/mail-confirmation-envoie/:id',
		'defaults' =>[
		'controller' => MailConfirmationController::class,
		'action' => 'envoie',
		],
		],
		],
		'mail-confirmation-envoye' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/mail-confirmation-envoye/:id',
		'defaults' =>[
		'controller' => MailConfirmationController::class,
		'action' => 'envoye',
		],
		],
		],
		'mail-confirmation-reception' => [
		'type' => Segment::class,
		'options' => [
		'route' => '/mail-confirmation-reception/:id/:code',
		'defaults' =>[
		'controller' => MailConfirmationController::class,
		'action' => 'reception',
		],
		],
		],
		'modifier-privilege' => [
		'type' => Segment::class,
		'options' => [
		@@ -268,36 +182,15 @@ return [
		],
		],
		],

		'service_manager' => [
		'invokables' => [],
		'factories' => [
		'MailConfirmationService' => MailConfirmationServiceFactory::class,
		],
		],
		'controllers' => [
		'invokables' => [
		'Application\Controller\Admin' => AdminController::class,

		],
		'factories' => [
		\Application\Controller\PrivilegeController::class => \Application\Controller\Factory\PrivilegeControllerFactory::class,
		MailConfirmationController::class => MailConfirmationControllerFactory::class,
		\Application\Controller\PrivilegeController::class => PrivilegeControllerFactory::class,
		RoleController::class => RoleControllerFactory::class,
		],
		],

		'form_elements' => [
		'invokables' => [
		],
		'factories' => [
		'MailConfirmationForm' => MailConfirmationFormFactory::class,
		],
		],
		'hydrators' => [
		'factories' => [
		'MailConfirmationHydrator' => MailConfirmationHydratorFactory::class,
		]
		],

		];