Commit 1d9372ff authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge branch 'b24'

parents ed7508d9 15d33dba

module/Enseignement/src/View/Helper/VolumeHoraire/ListeCalendaireViewHelper.php

+7 −1
Original line number Diff line number Diff line
@@ -274,7 +274,13 @@ class ListeCalendaireViewHelper extends AbstractHtmlElement 
    {

        if (!$horaire instanceof \DateTime) return null;



        return $horaire->format(Constants::DATETIME_FORMAT);

        $horaire = $horaire->format(Constants::DATETIME_FORMAT);



        if (str_ends_with($horaire, '00:00')){

            $horaire = substr($horaire, 0,-6);

        }



        return $horaire;

    }

public/js/pop-ajax.js

+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ $.widget("unicaen.popAjax", { 


        this.popInstance._config.content = ct.content;

        this.popInstance.setContent();

        this.popInstance.update();



        if (ct.title) {

            this.setTitle(ct.title);