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

HotFix

parent c6d4e6e1

doc/release-notes/v6.0.7.md

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ Rien pour le moment 
-- Nouvelles macros

INSERT INTO unicaen_renderer_macro (code, description, variable_name, methode_name) VALUES 

('Soutenance#DateRetourRapport', '<p>Affiche la date de retour des rapports</p>', 'soutenance', 'toStringDateRetourRapport'),

('Soutenance#Adresse', null, 'soutenance', 'toStringAdresse'),

('Url#PrerapportSoutenance', '<p>Adresse de téléchargement du pré-rapport de soutenance d''un rapporteur</p>', 'Url', 'getPrerapportSoutenance'),

('Avis#Justification', null, 'Avis', 'getMotif'),

('String#ToString', null, 'stringelement', 'getTexte'),

module/Soutenance/src/Soutenance/Service/Notification/SoutenanceNotificationFactory.php

+2 −1
Original line number Diff line number Diff line
@@ -569,6 +569,7 @@ class SoutenanceNotificationFactory extends NotificationFactory 
    public function createNotificationEnvoiConvocationMembre(Membre $membre, Proposition $proposition): Notification

    {

        $email = $membre->getEmail();

        $doctorant = $proposition->getThese()->getDoctorant();

        if ($email === null) {

            throw new RuntimeException("Aucun mail pour la notification [" . MailTemplates::SOUTENANCE_CONVOCATION_DOCTORANT . "]");

        }
@@ -577,7 +578,7 @@ class SoutenanceNotificationFactory extends NotificationFactory 
            throw new RuntimeException("Aucune validation de trouvée");

        }



        $vars = ['soutenance' => $proposition, 'these' => $proposition->getThese(), 'membre' => $membre, 'validation' => $validation[0], 'etablissement' => $proposition->getThese()->getEtablissement()];

        $vars = ['soutenance' => $proposition, 'doctorant' => $doctorant, 'these' => $proposition->getThese(), 'membre' => $membre, 'validation' => $validation[0], 'etablissement' => $proposition->getThese()->getEtablissement()];

        $url = $this->getUrlService()->setVariables($vars);

        $vars['Url'] = $url;

module/Soutenance/src/Soutenance/Service/Url/UrlService.php

+3 −1
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ namespace Soutenance\Service\Url; 
use DateTime;

use Fichier\Controller\FichierController;

use Laminas\View\Renderer\PhpRenderer;

use Notification\Exception\RuntimeException;

use Soutenance\Controller\AvisController;

use Soutenance\Controller\PresoutenanceController;

use Soutenance\Controller\PropositionController;
@@ -160,7 +161,8 @@ class UrlService { 
    /** @noinspection PhpUnused  */

    public function getSoutenanceConvocationDoctorant() : string

    {

        $these = $this->variables['$these'];

        $these = $this->variables['these'];

        if ($these === null) { throw new RuntimeException("Aucune thèse fournie"); }

        /** @see PresoutenanceController::convocationDoctorantAction() */

        $url = $this->renderer->url('soutenance/presoutenance/convocation-doctorant', ['these' => $these->getId()], ['force_canonical' => true], true);

        return $url;