Commit 50fee677 authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

Merge remote-tracking branch 'origin/b24' into b24

parents 97ed184e 171f2b7c
Loading
Loading
Loading
Loading
Loading
+3 −1
Changes for module/Mission/src/Controller/OffreEmploiController.php: 3 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -307,8 +307,10 @@ class OffreEmploiController extends AbstractController
        $utilisateur = $this->getServiceContext()->getUtilisateur();
        $intervenant = $this->getServiceContext()->getIntervenant();
        $canPostuler = $this->isAllowed($offreEmploi, Privileges::MISSION_OFFRE_EMPLOI_POSTULER);
        $canVoirCandidature = (empty($intervenant)) ? $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_CANDIDATURE_VISUALISATION)) : false;

        return compact('offreEmploi', 'utilisateur', 'canPostuler');

        return compact('offreEmploi', 'utilisateur', 'canPostuler', 'canVoirCandidature');
    }


+0 −1
Changes for module/Mission/view/mission/offre-emploi/detail.phtml: 0 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -13,7 +13,6 @@ $this->headTitle()->append("Gestion des offres d'emploi");
$canEdit               = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_OFFRE_EMPLOI_MODIFIER));
$canSupprimer          = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_OFFRE_EMPLOI_SUPPRESSION));
$canValider            = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_OFFRE_EMPLOI_VALIDER));
$canVoirCandidature    = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_CANDIDATURE_VISUALISATION));
$canValiderCandidature = $this->isAllowed(Privileges::getResourceId(Privileges::MISSION_CANDIDATURE_VALIDER));
$idOffre               = ($offreEmploi) ? $offreEmploi->getId() : null;
$titre                 = ($offreEmploi) ? $offreEmploi->getTitre() : 'Liste des offres d\'emploi';
+2 −1
Changes for module/OffreFormation/src/Form/GroupeTypeFormation/GroupeTypeFormationSaisieForm.php: 2 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -24,7 +24,8 @@ class GroupeTypeFormationSaisieForm extends AbstractForm

    public function init()
    {
        $ignore = ["ordre"];
        $ignore = ["ordre",
                   "source"];
        $this->spec(GroupeTypeFormation::class, $ignore);
        $this->build();

+4 −3
Changes for module/Paiement/src/Service/DemandesService.php: 4 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -245,6 +245,7 @@ class DemandesService extends AbstractService
            
        FROM
            tbl_paiement tp
        LEFT JOIN structure str ON   str.id = tp.structure_id
        LEFT JOIN service s ON	s.id = tp.service_id
        LEFT JOIN service_referentiel sr ON	sr.id = tp.service_referentiel_id
        LEFT JOIN structure ssr ON ssr.id = sr.structure_id
@@ -268,7 +269,7 @@ class DemandesService extends AbstractService

        //Si on ne veut que les heures à payer d'une structure donnée.
        if (!empty($structure)) {
            $sql .= " AND tp.structure_id = :structure";
            $sql .= " AND str.ids LIKE :structure";
        }

        $sql .= "
@@ -289,13 +290,13 @@ class DemandesService extends AbstractService
            MAX(th.code) ASC,
            MAX(fr.libelle_long) ASC,
            tp.mise_en_paiement_id ASC

        ";


        $params['intervenant'] = $intervenant->getId();

        if (!empty($structure)) {
            $params['structure'] = $structure->getId();
            $params['structure'] = $structure->idsFilter();
        }

        $dmeps = $this->getEntityManager()->getConnection()->fetchAllAssociative($sql, $params);