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

Merge branch 'abandon-information-fichier-#23349' into release-1.2.1

parents f84d8611 9f33b8e9

code/update-nommage.php

+2 −2
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ 


use Application\Entity\Db\Fichier;

use Application\Entity\Db\NatureFichier;

use Application\Filter\NomFichierFormatter;

use Application\Filter\NomFichierTheseFormatter;

use Application\Service\Fichier\FichierService;

use Application\Service\FichierThese\FichierTheseService;

use Application\Service\File\FileService;
@@ -40,7 +40,7 @@ $qb 
/** @var Fichier[] $fichiers */

$fichiers = $qb/*->setMaxResults(50)*/->getQuery()->getResult();



$nomFichierFormatter = new NomFichierFormatter();

$nomFichierFormatter = new NomFichierTheseFormatter();



$updatedFichiers = [];

foreach ($fichiers as $fichier) {

module/Application/config/others/fichier.config.php

+2 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ use Application\Service\Fichier\FichierServiceFactory; 
use Application\Service\FichierThese\FichierTheseServiceFactory;

use Application\Service\File\FileService;

use Application\Service\File\FileServiceFactory;

use Application\Service\NatureFichier\NatureFichierService;

use Application\Service\ValiditeFichier\ValiditeFichierService;

use Application\Service\VersionFichier\VersionFichierService;

use UnicaenAuth\Guard\PrivilegeController;
@@ -248,6 +249,7 @@ return array( 
    'service_manager' => array(

        'invokables' => array(

            'VersionFichierService' => VersionFichierService::class,

            'NatureFichierService' => NatureFichierService::class,

            'ValiditeFichierService' => ValiditeFichierService::class,

        ),

        'factories' => array(

module/Application/src/Application/Controller/FichierTheseController.php

+1 −5
Original line number Diff line number Diff line
@@ -9,7 +9,6 @@ use Application\Entity\Db\These; 
use Application\Entity\Db\VersionFichier;

use Application\EventRouterReplacerAwareTrait;

use Application\Filter\IdifyFilterAwareTrait;

use Application\Filter\NomFichierFormatter;

use Application\RouteMatch;

use Application\Service\Fichier\FichierServiceAwareTrait;

use Application\Service\FichierThese\Exception\DepotImpossibleException;
@@ -262,16 +261,13 @@ class FichierTheseController extends AbstractController 
                }

            }



            $nomFichierFormatter = new NomFichierFormatter();



            try {

                $fichierTheses = $this->fichierTheseService->createFichierThesesFromUpload(

                    $these,

                    $result,

                    $nature,

                    $version,

                    $retraitement,

                    $nomFichierFormatter

                    $retraitement

                );

            } catch (DepotImpossibleException $die) {

                return new JsonModel(['errors' => [$die->getMessage()]]);

module/Application/src/Application/Controller/Plugin/Uploader/UploaderPlugin.php

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ class UploaderPlugin extends AbstractPlugin implements ServiceLocatorAwareInterf 


        header('Content-Description: File Transfer');

        header('Content-Type: ' . $contentType);

        header('Content-Disposition: attachment; filename=' . $fichier->getNom());

        header('Content-Disposition: attachment; filename="' . $fichier->getNom() . '"');

        header('Content-Transfer-Encoding: binary');

        header('Content-Length: ' . strlen($content));

        header('Cache-Control: must-revalidate, post-check=0, pre-check=0');

module/Application/src/Application/Entity/Db/NatureFichier.php

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ class NatureFichier 
    const CODE_PROLONG_CONFIDENT = 'PROLONG_CONFIDENT';

    const CODE_CONV_MISE_EN_LIGNE = 'CONV_MISE_EN_LIGNE';

    const CODE_AVENANT_CONV_MISE_EN_LIGNE = 'AVENANT_CONV_MISE_EN_LIGNE';

    const CODE_INFORMATION = 'INFORMATION';

    const CODE_DIVERS = 'DIVERS';



    /**

     * @var string