Commit b9d7691e authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Merge branch 'master' into ModuleFormation_4.0.0

parents 8b6858fa 9b7f3b71
Loading
Loading
Loading
Loading
+4
Changes for CHANGELOG.md: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -11,6 +11,10 @@ Journal des modifications
- [FIX] Plantage de la page "Contact Assistance" en cas de connexion avec un compte local.
- [FIX] Activation de la mise en cache de la config lorsque le mode development est désactivé.
- [FIX] Lancement de la synchro des thèses pour prendre en compte la création/modification/suppression de substitution de structures.
- Ajout des unités de recherche fermées dans le filtre des thèses
- [FIX] correction du bug lié au typage de retour trop strict de l'entité Structure
- Mise en place de la déclaration de non plagiat dans la proposition de soutenance
- [FIX] Plantage lors de la création/modification/suppression d'une substitution de structure ("Synchro introuvable avec ce nom : these")

3.0.12
------
+x+17
Changes for config/autoload/unicaen-livelog.global.php: 17 added lines, 0 removed lines.
Original line number Diff line number Diff line
<?php

namespace UnicaenLivelog;

return [
    'unicaen-livelog' => [
        'websocket' => [
            'private_url' => '0.0.0.0:7443',
            'public_url' => '/livelog',
            'verbose' => false,
        ],
        'socket' => [
            'path' => 'unix:///tmp/unicaen_livelog.sock',
            'verbose' => false,
        ]
    ],
];
+2 −2
Changes for doc/release-notes/4.0.0/import.sql: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -626,10 +626,10 @@ FROM tmp_role tmp
         JOIN etablissement e ON e.id = src.etablissement_id
         JOIN structure s ON s.id = e.structure_id;

create view src_structure(id, source_code, code, source_id, type_structure_id, sigle, libelle) as
create or replace view src_structure(id, source_code, code, source_id, type_structure_id, sigle, libelle) as
SELECT NULL::text                                                         AS id,
        tmp.source_code,
       tmp.source_code AS code,
       ltrim(substr(tmp.source_code, strpos(tmp.source_code, '::')), ':') AS code,
       src.id                                                             AS source_id,
       ts.id                                                              AS type_structure_id,
       tmp.sigle,
+59
Changes for doc/release-notes/v4.0.0.md: 59 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -66,4 +66,63 @@ NB : si chez vous il existe déjà une clé `'import'`, écrasez-la par le nouve
Dans la base de données
-----------------------

- Ajout des nouvelles validations liées aux déclarations de non plagiat
```SQL
insert into type_validation (id, code, libelle) VALUES (nextval('type_validation_id_seq'), 'DOCTORANT_DECLARATION_HONNEUR_NON_PLAGIAT', 'Déclaration sur l''honneur de non plagiat du doctorant');
insert into type_validation (id, code, libelle) VALUES (nextval('type_validation_id_seq'), 'DOCTORANT_REFUS_HONNEUR_NON_PLAGIAT', 'Refus de la déclaration sur l''honneur de non plagiat du doctorant');
```

- Ajout des privilèges associés aux déclarations de non plagiat
```SQL
insert into PRIVILEGE(ID, CATEGORIE_ID, CODE, LIBELLE, ORDRE)
with d(ordre, code, lib) as (
  select 1001, 'declaration-honneur-valider', 'Valider/Refuser la déclaration sur l''honneur de non plagiat' union
  select 1002, 'declaration-honneur-revoquer', 'Revoquer la déclaration sur l''honneur de non plagiat'
)
select nextval('privilege_id_seq'), cp.id, d.code, d.lib, d.ordre
from d
       join CATEGORIE_PRIVILEGE cp on cp.CODE = 'soutenance'
;

-- declaration-honneur-valider doit être accorder aux doctorants
INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)
with data(categ, priv) as (
  select 'soutenance'::text, 'declaration-honneur-valider'::text
)
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
       join PROFIL on profil.ROLE_ID in ('DOCTORANT')
       join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ
       join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv
where not exists (
        select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id
  ) ;

-- declaration-honneur-revoquer doit être accorder aux BDD et aux administrateurs
INSERT INTO PROFIL_PRIVILEGE (PRIVILEGE_ID, PROFIL_ID)
with data(categ, priv) as (
  select 'soutenance'::text, 'declaration-honneur-revoquer'::text
)
select p.id as PRIVILEGE_ID, profil.id as PROFIL_ID
from data
       join PROFIL on profil.ROLE_ID in ('ADMIN_TECH', 'BDD')
       join CATEGORIE_PRIVILEGE cp on cp.CODE = data.categ
       join PRIVILEGE p on p.CATEGORIE_ID = cp.id and p.code = data.priv
where not exists (
        select * from PROFIL_PRIVILEGE where PRIVILEGE_ID = p.id and PROFIL_ID = profil.id
  ) ;

insert into ROLE_PRIVILEGE (ROLE_ID, PRIVILEGE_ID)
select p2r.ROLE_ID, pp.PRIVILEGE_ID
from PROFIL_TO_ROLE p2r
       join profil pr on pr.id = p2r.PROFIL_ID
       join PROFIL_PRIVILEGE pp on pp.PROFIL_ID = pr.id
where not exists (
        select * from role_privilege where role_id = p2r.role_id and privilege_id = pp.privilege_id
  )
;
```

- Changements majeurs concernant l'import

Cf. [ici](4.0.0/import.sql)
+3
Changes for docker-compose.yml: 3 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -34,6 +34,9 @@ services:
    environment:
      POSTGRES_USER: postgres
      POSTGRES_PASSWORD: admin
      SYGAL_DB: sygal
      SYGAL_USER: ad_sygal
      SYGAL_PASSWORD: azerty
    ports:
      - 5432:5432
    volumes:
Loading