Commit ca20eeee authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

[FIX] Correction du plantage lors de la création manuelle d'un utilisateur.

parent 1958aaea
Loading
Loading
Loading
Loading
+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ Journal des modifications
- Retrait de `IntervenantEmailFormatter` et de `IntervenantTrouveFormatter` (classes inutilisées)
- Changement du terme Établissement par Site dans l'affichage des rôles des EDs et des URs pour éviter la confusion
- [FIX] retrait d'un début faisant planter la génération de convaocation de soutenance 
- [FIX] Correction du plantage lors de la création manuelle d'un utilisateur.

4.2.0
-----
+1 −0
Changes for module/Application/src/Application/Form/AdresseMail/AdresseMailForm.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ class AdresseMailForm extends Form {
                'validators' => [
                    [
                        'name' => NewEmailValidator::class,
                        'options' => ['perimetre' => ['utilisateur']],
                    ],
                ],
            ],
+1 −0
Changes for module/Application/src/Application/Form/CreationUtilisateurForm.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ class CreationUtilisateurForm extends Form implements InputFilterProviderInterfa
                'validators' => [
                    [
                        'name' => NewEmailValidator::class,
                        'options' => ['perimetre' => ['utilisateur']],
                    ],
                ],
            ],
+1 −0
Changes for module/Application/src/Application/Form/CreationUtilisateurFromIndividuForm.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ class CreationUtilisateurFromIndividuForm extends Form implements InputFilterPro
                'validators' => [
                    [
                        'name' => NewEmailValidator::class,
                        'options' => ['perimetre' => ['utilisateur']],
                    ],
                ],
            ],
+17 −1
Changes for module/Application/src/Application/Form/Validator/NewEmailValidator.php: 17 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -15,6 +15,8 @@ class NewEmailValidator extends AbstractValidator
    const UTILISATEUR = 'utilisateur';
    const INDIVIDU = 'individu';

    protected array $perimetre = [self::UTILISATEUR, self::INDIVIDU];

    protected array $messageTemplates = [
        self::UTILISATEUR => "Adresse électronique déjà utilisée (Utilisateur)",
        self::INDIVIDU => "Adresse électronique déjà utilisée (Individu)",
@@ -29,7 +31,7 @@ class NewEmailValidator extends AbstractValidator
            $nb_pb++;
        }

        $perimetre = $this->getOption('perimetre') ?: ['utilisateur', 'individu'];
        $perimetre = $this->getPerimetre();

        if (in_array('utilisateur', $perimetre)) {
            if ($this->entityManager->getRepository(Individu::class)->findOneBy(['email' => $value]) !== null) {
@@ -48,5 +50,19 @@ class NewEmailValidator extends AbstractValidator
        return true;
    }

    /**
     * @param string[] $perimetre
     */
    public function setPerimetre(array $perimetre): void
    {
        $this->perimetre = $perimetre;
    }

    /**
     * @return string[]
     */
    public function getPerimetre(): array
    {
        return $this->perimetre;
    }
}
 No newline at end of file