Commit 323b4faa authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge branch 'release_4.0.6'

parent f95aec09

CHANGELOG.md

+6 −0
Changes for CHANGELOG.md: 6 added lines, 0 removed lines.
Original line number Diff line number Diff line 
Journal des modifications

=========================



4.0.6

-----

- Retour du logo ESUp-SyGAL dans la barre de menu principal. 

  Assombrissement du bleu dans la barre de menu principal et dans le pied de page.

- [FIX] Plantage lors de la création d'une structure (ED, UR, établissement).



4.0.5

-----

- [FIX] Correction du plantage de la page de saisie du mail perso doctorant.

doc/database/sql/02_create_schema.sql

+4 −2
Changes for doc/database/sql/02_create_schema.sql: 4 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -2495,7 +2495,8 @@ CREATE TABLE public.tmp_individu ( 
    dat_nai_per timestamp without time zone,

    lib_nat character varying(128),

    supann_id character varying(30),

    source_insert_date timestamp without time zone DEFAULT ('now'::text)::timestamp without time zone

    source_insert_date timestamp without time zone DEFAULT ('now'::text)::timestamp without time zone,

    codepaysnationalite character varying(60)

);
@@ -2687,7 +2688,8 @@ CREATE TABLE public.tmp_these ( 
    dat_abandon timestamp without time zone,

    dat_transfert_dep timestamp without time zone,

    source_insert_date timestamp without time zone DEFAULT ('now'::text)::timestamp without time zone,

    correction_effectuee character varying(30) DEFAULT 'null'::character varying

    correction_effectuee character varying(30) DEFAULT 'null'::character varying,

    codesisediscipline character varying(40)

);

doc/release-notes/v4.0.6.md

0 → 100644
+18 −0
Changes for doc/release-notes/v4.0.6.md: 18 added lines, 0 removed lines.
Original line number Diff line number Diff line 
# Version 4.0.6



## 1. Sur le serveur d'application



- Placez-vous dans le répertoire de l'application puis lancez la commande suivante

  pour installer la nouvelle version :



```bash

git fetch --tags && git checkout --force 4.0.6 && bash ./install.sh

```



- Selon le moteur PHP que vous avez installé, rechargez le service, exemple :

    - php7.4-fpm         : `service php7.4-fpm reload`

    - apache2-mod-php7.4 : `service apache2 reload`



## 2. Dans la base de données



Néant.

module/Application/src/Application/Controller/StructureConcreteController.php

+13 −13
Changes for module/Application/src/Application/Controller/StructureConcreteController.php: 13 added lines, 13 removed lines.
Original line number Diff line number Diff line
@@ -42,6 +42,19 @@ abstract class StructureConcreteController extends AbstractController 
     */

    protected $routeName;



    /**

     * @var UniteRechercheForm|EcoleDoctoraleForm|EtablissementForm

     */

    protected $structureForm;



    /**

     * @param UniteRechercheForm|EcoleDoctoraleForm|EtablissementForm $form

     */

    public function setStructureForm($form)

    {

        $this->structureForm = $form;

    }



    /**

     * @return ViewModel

     */
@@ -113,19 +126,6 @@ abstract class StructureConcreteController extends AbstractController 
        ]);

    }



    /**

     * @var UniteRechercheForm|EcoleDoctoraleForm|EtablissementForm

     */

    protected $structureForm;



    /**

     * @param UniteRechercheForm|EcoleDoctoraleForm|EtablissementForm $form

     */

    public function setStructureForm($form)

    {

        $this->structureForm = $form;

    }



    /**

     * Modifier permet soit d'afficher le formulaire associé à la modification soit de mettre à jour

     * les données associées à une structure (Sigle, Libellé, Code et Logo)

module/Application/src/Application/Form/EcoleDoctoraleForm.php

+0 −3
Changes for module/Application/src/Application/Form/EcoleDoctoraleForm.php: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -21,9 +21,6 @@ class EcoleDoctoraleForm extends Form 
    {

        $this->setObject(new EcoleDoctorale());



        $this

            ->add(new Hidden('id'));



        $this->add((

            new Text('sigle'))

                ->setLabel("Sigle :")