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

Fix

parent 91219327
Loading
Loading
Loading
Loading
+2 −1
Changes for module/Application/src/Application/Entity/Db/MacroContent/FichePosteMacroTrait.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@
namespace Application\Entity\Db\MacroContent;

use Application\Entity\Db\FichePoste;
use Application\Entity\Db\FicheposteActiviteDescriptionRetiree;
use Application\Entity\Db\ParcoursDeFormation;
use Element\Entity\Db\CompetenceType;
use Formation\Entity\Db\Formation;
@@ -280,7 +281,7 @@ trait FichePosteMacroTrait {
    {
        /** @var FichePoste $ficheposte */
        $ficheposte = $this;
        $descriptionsRetirees = array_map(function ($a) { return $a->getDescription()->getId(); }, $ficheposte->getDescriptionsRetirees()->toArray());
        $descriptionsRetirees = array_map(function ($a) { return $a->getDescription()->getId(); }, $ficheposte->getDescriptionsRetirees());

        $texte = "";
        foreach ($ficheposte->getFichesMetiers() as $ficheTypeExterne) {
+7 −1
Changes for module/Formation/view/formation/structure/afficher.phtml: 7 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -114,8 +114,14 @@ $filles = array_filter($filles, function (Structure $a) use ($now) {
        $('select#structure-selecteur').change(function() {
            let id = $('select#structure-selecteur option:selected').val();
            if (id !== "" && id !== "<?php echo $structure->getId(); ?>") {
                let url = window.location.href;
                let splits = url.split("/");
                let last = (splits.at(-1));
                if (last === "structure") {
                    window.location.href = './structure/' + id;
                } else {
                    window.location.href = './' + id;
                //window.location.href = <?php //echo "'".$this->url('formation/structure/afficher', [], ['force_canonical' => true], true)."'"; ?>// + "/" + id;
                }
            }
        });
    });