Commit 943c2807 authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

[FIX] Corrections suite à l'intégration du nouveau module Fichier.

parent 24c5599d

CHANGELOG.md

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


5.1.1

-----

- [FIX] Corrections suite à l'intégration du nouveau module Fichier.

- [FIX] Suppression physique de l'ancien fichier lors du changement de logo d'une structure.

- [FIX] Correction et amélioration du calcul du nom de fichier du logo (existant ou nouveau) d'une structure.

- Template de pagination : abandon du module/Application/view/paginator.phtml et généralisation du module/Application/view/application/paginator.phtml

module/Application/src/Application/Controller/CoEncadrantController.php

+0 −1
Changes for module/Application/src/Application/Controller/CoEncadrantController.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -163,7 +163,6 @@ class CoEncadrantController extends AbstractActionController { 
        $theses = $this->getTheseService()->getRepository()->fetchThesesByCoEncadrant($coencadrant->getIndividu());



        $logos = [];

//        $logos['etablissement'] = $this->fileService->computeLogoFilePathForStructure($coencadrant->getEtablissement());

        try {

            $logos['etablissement'] = $this->fichierStorageService->getFileForLogoStructure($coencadrant->getEtablissement());

        } catch (StorageAdapterException $e) {

module/Application/src/Application/Controller/Rapport/RapportRechercheController.php

+1 −1
Changes for module/Application/src/Application/Controller/Rapport/RapportRechercheController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ use Application\Controller\AbstractController; 
use Application\Entity\Db\Interfaces\TypeRapportAwareTrait;

use Application\Entity\Db\Interfaces\TypeValidationAwareTrait;

use Application\Entity\Db\Rapport;

use Application\Entity\FichierArchivable;

use Fichier\Entity\FichierArchivable;

use Application\Search\Controller\SearchControllerInterface;

use Application\Search\Controller\SearchControllerTrait;

use Application\Search\SearchServiceAwareTrait;

module/Application/src/Application/Controller/TheseController.php

+0 −1
Changes for module/Application/src/Application/Controller/TheseController.php: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -1385,7 +1385,6 @@ class TheseController extends AbstractController 
        if ($etablissement === null) {

            $etablissement = $these->getEtablissement();

        }

//        $cheminLogo = $this->fileService->computeLogoFilePathForStructure($etablissement);

        try {

            $cheminLogo = $this->fichierStorageService->getFileForLogoStructure($etablissement);

        } catch (StorageAdapterException $e) {

module/Application/src/Application/Service/These/TheseService.php

+0 −5
Changes for module/Application/src/Application/Service/These/TheseService.php: 0 added lines, 5 removed lines.
Original line number Diff line number Diff line
@@ -551,7 +551,6 @@ class TheseService extends BaseService implements ListenerAggregateInterface 
            if ($directeur->getEtablissement()) {

                if ($directeur->getEtablissement()->estAssocie()) {

                    $pdcData->setAssocie(true);

//                    $pdcData->setLogoAssocie($this->fileService->computeLogoFilePathForStructure($directeur->getEtablissement()));

                    try {

                        $pdcData->setLogoAssocie($this->fichierStorageService->getFileForLogoStructure($directeur->getEtablissement()));

                    } catch (StorageAdapterException $e) {
@@ -634,21 +633,18 @@ class TheseService extends BaseService implements ListenerAggregateInterface 


        // chemins vers les logos

        if ($comue = $this->etablissementService->fetchEtablissementComue()) {

//            $pdcData->setLogoCOMUE($this->fileService->computeLogoFilePathForStructure($comue));

            try {

                $pdcData->setLogoCOMUE($this->fichierStorageService->getFileForLogoStructure($comue));

            } catch (StorageAdapterException $e) {

                $pdcData->setLogoCOMUE(null);

            }

        }

//        $pdcData->setLogoEtablissement($this->fileService->computeLogoFilePathForStructure($these->getEtablissement()));

        try {

            $pdcData->setLogoEtablissement($this->fichierStorageService->getFileForLogoStructure($these->getEtablissement()));

        } catch (StorageAdapterException $e) {

            $pdcData->setLogoEtablissement(null);

        }

        if ($these->getEcoleDoctorale() !== null) {

//            $pdcData->setLogoEcoleDoctorale($this->fileService->computeLogoFilePathForStructure($these->getEcoleDoctorale()));

            try {

                $pdcData->setLogoEcoleDoctorale($this->fichierStorageService->getFileForLogoStructure($these->getEcoleDoctorale()));

            } catch (StorageAdapterException $e) {
@@ -656,7 +652,6 @@ class TheseService extends BaseService implements ListenerAggregateInterface 
            }

        }

        if ($these->getUniteRecherche() !== null) {

//            $pdcData->setLogoUniteRecherche($this->fileService->computeLogoFilePathForStructure($these->getUniteRecherche()));

            try {

                $pdcData->setLogoUniteRecherche($this->fichierStorageService->getFileForLogoStructure($these->getUniteRecherche()));

            } catch (StorageAdapterException $e) {