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

Merge branch 'master' into application_groupe

parents 1d464fd9 fcc30958

module/Application/src/Application/Form/Metier/MetierHydrator.php

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ class MetierHydrator implements HydratorInterface { 
        }



        $data = [

            'categorie' => $object->getCategorie()->getId(),

            'categorie' => ($object->getCategorie())?$object->getCategorie()->getId():null,

            'domaines' => $domaineIds,

            'libelle' => $object->getLibelle(),

        ];

module/Application/src/Application/View/Helper/partial/type-fonction.phtml

+2 −0
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ $type = $domaine->getTypeFonction(); 


<style>

    span.label.Support {

        display: inline-block;

        background-color: seagreen;

    }

    span.label.Soutien {

        display: inline-block;

        background-color: darkslateblue;

    }

</style>
 
 No newline at end of file

module/Application/view/application/metier/partial/listing-metier.phtml

+1 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ $canEffacer = $droits["effacer"]; 
                    <?php endif; ?>

            </td>

            <td>

                <?php echo $metier->getCategorie()->getCode(); ?>

                <?php echo ($metier->getCategorie())?$metier->getCategorie()->getCode():""; ?>

            </td>

            <td>

                <?php if ($canEditer) : ?>