Commit bbb8acb1 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

[FIX] Correction de bugs en cas d'utilisateur ayant à la fois le rôle Doctorant et un autre rôle.

parent e66fcd7c

CHANGELOG.md

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

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



6.0.5

-----

- [FIX] Correction de bugs en cas d'utilisateur ayant à la fois le rôle Doctorant et un autre rôle.



6.0.4

-----

- [FIX] Recherche de rapports d'Activité/CSI/Mi-parcours : les filtres Établissement/ED/UR géraient mal la subsitution de structures.

doc/release-notes/v6.0.5.md

0 → 100644
+22 −0
Changes for doc/release-notes/v6.0.5.md: 22 added lines, 0 removed lines.
Original line number Diff line number Diff line 
# Version 6.0.5



## 1. Sur le serveur d'application



*Rappel : depuis la version 6.0.0, la version de PHP requise est la 8.0.*



- 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 6.0.5 && bash ./install.sh

```



- Rechargez le moteur PHP, exemple :



```bash

systemctl reload php8.0-fpm

```



## 2. Dans la base de données



RAS.
 
 No newline at end of file

module/Application/src/Application/Assertion/Rapport/RapportControllerAssertion.php

+5 −1
Changes for module/Application/src/Application/Assertion/Rapport/RapportControllerAssertion.php: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -40,7 +40,11 @@ class RapportControllerAssertion extends ControllerAssertion 


    private function assertAppartenanceThese()

    {

        if ($doctorant = $this->userContextService->getIdentityDoctorant()) {

        $role = $this->userContextService->getSelectedIdentityRole();



        // rôle doctorant

        if ($role->isDoctorant()) {

            $doctorant = $this->userContextService->getIdentityDoctorant();

            $this->assertTrue(

                $this->these->getDoctorant()->getId() === $doctorant->getId(),

                "La thèse n'appartient pas au doctorant " . $doctorant

module/Application/src/Application/Assertion/Rapport/RapportEntityAssertion.php

+5 −1
Changes for module/Application/src/Application/Assertion/Rapport/RapportEntityAssertion.php: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -74,7 +74,11 @@ class RapportEntityAssertion implements EntityAssertionInterface 


    private function assertAppartenanceThese()

    {

        if ($doctorant = $this->userContextService->getIdentityDoctorant()) {

        $role = $this->userContextService->getSelectedIdentityRole();



        // rôle doctorant

        if ($role->isDoctorant()) {

            $doctorant = $this->userContextService->getIdentityDoctorant();

            $this->assertTrue(

                $this->rapport->getThese()->getDoctorant()->getId() === $doctorant->getId(),

                "La thèse n'appartient pas au doctorant " . $doctorant

module/Application/src/Application/Assertion/Rapport/RapportPageAssertion.php

+5 −1
Changes for module/Application/src/Application/Assertion/Rapport/RapportPageAssertion.php: 5 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -54,7 +54,11 @@ class RapportPageAssertion implements PageAssertionInterface, UserContextService 


    private function assertAppartenanceThese()

    {

        if ($doctorant = $this->userContextService->getIdentityDoctorant()) {

        $role = $this->userContextService->getSelectedIdentityRole();



        // rôle doctorant

        if ($role->isDoctorant()) {

            $doctorant = $this->userContextService->getIdentityDoctorant();

            $this->assertTrue(

                $this->these->getDoctorant()->getId() === $doctorant->getId(),

                "La thèse n'appartient pas au doctorant " . $doctorant