Commit c5f3876a authored by Thomas Hamel's avatar Thomas Hamel
Browse files

[FIX] Module Admission : modification de la convention de formation doctorale impossible

parent c810c216

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ Journal des modifications 
- Passage unicaen/renderer 7.0.2 (et donc à TinyMCE 6.3.0).

- Filtre 'Catégorie de privilège' sur les pages 'Droits d'accès' : la liste est désormais issue d'une requête en bdd.

- [FIX] Rapport d'activité : correction du filtrage selon le profil de l'utilisateur.

- [FIX] Module Admission : modification de la convention de formation doctorale impossible



9.2.1

-----

module/Admission/src/Admission/Renderer/AdmissionTemplateVariable.php

+0 −8
Original line number Diff line number Diff line
@@ -34,14 +34,6 @@ class AdmissionTemplateVariable extends AbstractTemplateVariable 
        $this->admission = $admission;

    }



    /**

     * @return Admission

     */

    public function getAdmission(): Admission

    {

        return $this->admission;

    }



    public function setOperationAttenduNotificationAnomalies(?string $anomalies): void

    {

        $this->operationAttenduNotificationAnomalies = $anomalies;

module/Admission/view/admission/admission/partial/document/document.phtml

+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ $enCours = isset($admission) && $admission->getEtat()->getCode() === Etat::CODE_ 
                        $nameRoute = $conventionFormationDoctorale ? 'admission/modifier-convention-formation' : 'admission/ajouter-convention-formation';

                        $classButton = $canGenererConventionFormationDoctorale ? "" : "required"; ?>

                        <a href="<?php echo $this->url($nameRoute, ['admission' => $admission->getId()], [], true) ?>"

                           class="btn btn-primary access-conv-form-doct-btn <?=$classButton?>"

                           class="btn btn-primary <?=$classButton?>"

                           title="Accéder à la convention de formation doctorale">Remplir la convention de formation doctorale</a>

                    <?php endif;

module/Admission/view/admission/admission/partial/document/modal/charte.phtml

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ $dejaTeleversee = array_key_exists($natureFichierCharteDoctoratSignee, $document 
                                if($role->getCode() === Role::CODE_GEST_ED || $role->getRoleId() === Role::ROLE_ID_ADMISSION_CANDIDAT):

                                    echo $this->formfile($fieldsetCharteDoctoratSignee->setAttribute('disabled', false));

                                else:

                                    echo $this->formfile($fieldsetCharteDoctoratSignee);

                                    echo $this->formfile($fieldsetCharteDoctoratSignee->setAttribute('disabled', true));;

                                endif;

                                ?>

                            </div>