Commit 7b72ae55 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

FIX champ emailPro appelé par son ancien nom dans le validateur, fix vérif des... 

FIX champ emailPro appelé par son ancien nom dans le validateur, fix vérif des droits pour la création des missions d'enseignements
parent fb94dac6

module/Application/src/Application/Form/Validator/NewEmailValidator.php

+1 −1
Changes for module/Application/src/Application/Form/Validator/NewEmailValidator.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -40,7 +40,7 @@ class NewEmailValidator extends AbstractValidator 
            }

        }

        if (in_array('individu', $perimetre)) {

            if ($this->entityManager->getRepository(Individu::class)->findOneBy(['email' => $value]) !== null) {

            if ($this->entityManager->getRepository(Individu::class)->findOneBy(['emailPro' => $value]) !== null) {

                $this->error(self::INDIVIDU);

                $nb_pb++;

            }

module/Soutenance/src/Soutenance/Form/Membre/MembreForm.php

+10 −3
Changes for module/Soutenance/src/Soutenance/Form/Membre/MembreForm.php: 10 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 


namespace Soutenance\Form\Membre;



use Laminas\Form\Element\Button;

use Soutenance\Entity\Membre;

use Soutenance\Service\Qualite\QualiteServiceAwareTrait;

use UnicaenApp\Service\EntityManagerAwareTrait;
@@ -106,9 +107,15 @@ class MembreForm extends Form { 
                ])

        );



        $this->add((new Submit('submit'))

            ->setValue("Enregistrer")

            ->setAttribute('class', 'btn btn-primary')

        $this->add((new Button('submit'))

            ->setLabel('<span class="icon icon-save"></span> Enregistrer')

            ->setLabelOptions([

                'disable_html_escape' => true,

            ])

            ->setAttributes([

                'type' => 'submit',

                'class' => 'btn btn-primary',

            ])

        );



        $this->setInputFilter((new Factory())->createInputFilter([

module/These/view/these/these/identite.phtml

+3 −3
Changes for module/These/view/these/these/identite.phtml: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -206,7 +206,7 @@ switch ($these->getEtatThese()){ 
                        <dt class="col-md-3">

                            Mission·s d'enseignement

                        </dt>

                        <?php if ($canMissionGerer) : ?>

                        <?php if ($canMissionGerer && $canEditThese) : ?>

                            <a  <?php /**  @see \Doctorant\Controller\MissionEnseignementController::ajouterAction() */ ?>

                                    class="icon icon-plus iconly ajax-modal float-end" data-event="modification"

                                    href="<?php echo $this->url('doctorant/mission-enseignement/ajouter', ['doctorant' => $these->getDoctorant()->getId()], [], true); ?>"
@@ -219,7 +219,7 @@ switch ($these->getEtatThese()){ 
                                <ul>

                                    <?php foreach ($missions as $mission) : ?>

                                        <li>Mission d'enseignement pour l'année <?php echo $mission->getAnneeUniversitaire(); ?>/<?php echo ($mission->getAnneeUniversitaire()+1); ?>

                                        <?php if ($canMissionGerer) : ?>

                                        <?php if ($canMissionGerer && $canEditThese) : ?>

                                            <a  <?php /**  @see \Doctorant\Controller\MissionEnseignementController::retirerAction() */ ?>

                                                    class="ajax-modal" data-event="modification"

                                                    data-toggle="confirmationx" data-message="Êtes-vous sûr·e de vouloir retirer cette mission d'enseignement ?"
@@ -318,7 +318,7 @@ switch ($these->getEtatThese()){ 
                    <dd class="col-md-9 <?php echo $class ?>">

                        <p>

                            <?php echo $reponse ?>

                            <?php if ($canEditForcageCorrectionAutorisee): ?>

                            <?php if ($canEditForcageCorrectionAutorisee && $canEditThese): ?>

                                <?php if ($these->isCorrectionAutoriseeForcee()): ?>

                                    <em>Cette valeur est forcée.</em>

                                <?php endif ?>