Commit 579867d0 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

[FIX] Modification de l'adresse l'adresse institutionnelle/pro d'un individu non prise en compte

parent ea9eb6f4

CHANGELOG.md

+1 −0
Changes for CHANGELOG.md: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ Journal des modifications 
- [FIX] Notifications de demande d'engagement d'impartialité et d'avis de soutenance : utilisation en priorité du mail de l'acteur.

- [FIX] Impossible d'accèder aux pages de consultation/modification d'ED ou d'UR.

- [FIX] Coquille dans le procès verbal de soutenance (PDF).

- [FIX] Modification de l'adresse l'adresse institutionnelle/pro d'un individu non prise en compte



8.6.0

-----

module/Individu/src/Individu/Entity/Db/Individu.php

+6 −6
Changes for module/Individu/src/Individu/Entity/Db/Individu.php: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -72,7 +72,7 @@ class Individu implements 
    /**

     * @var string

     */

    protected $email;

    protected $emailPro;



    /**

     * @var string
@@ -260,14 +260,14 @@ class Individu implements 
    }



    /**

     * Set email

     * Set emailPro

     *

     * @param string $email

     * @param string $emailPro

     * @return self

     */

    public function setEmailPro(string $email): self

    public function setEmailPro(string $emailPro): self

    {

        $this->email = $email;

        $this->emailPro = $emailPro;



        return $this;

    }
@@ -283,7 +283,7 @@ class Individu implements 
    {

        $email = $useComplement && $this->getEmailProComplement() ?

            $this->getEmailProComplement() :

            $this->email;

            $this->emailPro;



        if ($email === null || trim($email) === '') {

            return null;

module/Individu/src/Individu/Entity/Db/Mapping/Individu.Entity.Db.Individu.dcm.xml

+1 −1
Changes for module/Individu/src/Individu/Entity/Db/Mapping/Individu.Entity.Db.Individu.dcm.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
        <field name="dateNaissance" type="datetime" column="date_naissance"/>

        <field name="nationalite" column="nationalite" nullable="true"/><!-- sera remplacée par "paysNationalite" -->

        <field name="apatride" column="apatride" type="boolean"/>

        <field name="email" column="email" nullable="true"/>

        <field name="emailPro" column="email" nullable="true"/>

        <field name="nomPatronymique" column="nom_patronymique"/>

        <field name="nomUsuel" column="nom_usuel"/>

        <field name="prenom1" column="prenom1"/>

module/Individu/src/Individu/Form/IndividuForm.php

+4 −4
Changes for module/Individu/src/Individu/Form/IndividuForm.php: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ class IndividuForm extends Form implements InputFilterProviderInterface 
                ->setLabel("Prénom 2 :")

        );

        $this->add(

            (new Text('email'))

            (new Text('emailPro'))

                ->setLabel("Adresse électronique institutionnelle/pro:")

        );

        $this->add(
@@ -131,7 +131,7 @@ class IndividuForm extends Form implements InputFilterProviderInterface 
        $this->get('nomPatronymique')->setAttribute('disabled', !$estModifiable);

        $this->get('prenom1')->setAttribute('disabled', !$estModifiable);

        $this->get('prenom2')->setAttribute('disabled', !$estModifiable);

        $this->get('email')->setAttribute('disabled', !$estModifiable);

        $this->get('emailPro')->setAttribute('disabled', !$estModifiable);

        $this->get('dateNaissance')->setAttribute('disabled', !$estModifiable);

        $this->get('apatride')->setAttribute('disabled', !$estModifiable);

        $this->get('paysNationalite')->setAttribute('disabled', !$estModifiable);
@@ -180,8 +180,8 @@ class IndividuForm extends Form implements InputFilterProviderInterface 
                'name' => 'prenom2',

                'required' => false,

            ],

            'email' => [

                'name' => 'email',

            'emailPro' => [

                'name' => 'emailPro',

                'required' => false,

                'validators' => $emailValidators,

            ],

module/Individu/view/individu/individu/modifier.phtml

+1 −1
Changes for module/Individu/view/individu/individu/modifier.phtml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ $form->setAttribute('class', 'row')->prepare(); 
</div>

<div class="row">

    <div class="col-md-3">

        <?php echo $this->formControlGroup($form->get('email')) ?>

        <?php echo $this->formControlGroup($form->get('emailPro')) ?>

    </div>

</div>

<div class="row">