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

[FIX] Création d'avis sur rapport d'activité

parent 1c0beb68

module/RapportActivite/src/RapportActivite/Controller/Avis/RapportActiviteAvisController.php

+5 −5
Original line number Diff line number Diff line
@@ -92,9 +92,7 @@ class RapportActiviteAvisController extends AbstractController 
        $avis = new Avis();

        $avis->setAvisType($avisTypeDispo);



        if ($filter = $this->getAvisTypeValeurComplemsFilter($rapportActivite)) {

            $this->form->setAvisTypeValeurComplemsFilter($filter);

        }

        $this->form->setAvisTypeValeurComplemsFilter($this->getAvisTypeValeurComplemsFilter($rapportActivite));

        $this->form->bind($avis);

        $this->form->setAttribute('action', $this->url()->fromRoute(

            'rapport-activite/avis/ajouter', [], ['query' => $this->params()->fromQuery()], true
@@ -151,8 +149,10 @@ class RapportActiviteAvisController extends AbstractController 
    public function modifierAction()

    {

        $rapportActiviteAvis = $this->requestedRapportAvis();

        $these = $rapportActiviteAvis->getRapportActivite()->getThese();

        $rapportActivite = $rapportActiviteAvis->getRapportActivite();

        $these = $rapportActivite->getThese();



        $this->form->setAvisTypeValeurComplemsFilter($this->getAvisTypeValeurComplemsFilter($rapportActivite));

        $this->form->bind($rapportActiviteAvis->getAvis());

        $this->form->setAttribute('action', $this->url()->fromRoute(

            'rapport-activite/avis/modifier', [], ['query' => $this->params()->fromQuery()], true
@@ -179,7 +179,7 @@ class RapportActiviteAvisController extends AbstractController 
        }



        return [

            'rapport' => $rapportActiviteAvis->getRapportActivite(),

            'rapport' => $rapportActivite,

            'form' => $this->form,

            'title' => "Modification d'un avis à propos d'un rapport",

        ];

module/UnicaenAvis/src/UnicaenAvis/Form/AvisForm.php

+2 −2
Original line number Diff line number Diff line
@@ -67,9 +67,9 @@ class AvisForm extends Form implements InputFilterProviderInterface 
    /**

     * Spécifie le filtre à utiliser dans un {@see array_filter()} pour filtrer les éventuels compléments d'avis.

     *

     * @param callable $filter

     * @param callable|null $filter

     */

    public function setAvisTypeValeurComplemsFilter(callable $filter)

    public function setAvisTypeValeurComplemsFilter(callable $filter = null)

    {

        $this->avisTypeValeurComplemsFilter = $filter;

    }