Commit 245159f2 authored by Jean-Philippe Metivier's avatar Jean-Philippe Metivier
Browse files

Correction retrait des profils lors que le profil est dans un sous-structure

parent 2053a53a

module/Application/src/Application/Controller/FichePosteController.php

+8 −2
Original line number Diff line number Diff line
@@ -365,8 +365,14 @@ class FichePosteController extends AbstractActionController { 
            } else {

                if ($form->isValid()) {

                    $this->getFichePosteService()->update($fiche);

                    $structure->removeFichePosteRecrutement($fiche);

                    $this->getStructureService()->update($structure);



                    /**  !Attention! la fiche peut-être dans une sous-structure **/

                    $structures = $this->getStructureService()->getStructuresFilles($structure);

                    $structures[] = $structure;

                    foreach ($structures as $structureTMP) {

                        $structureTMP->removeFichePosteRecrutement($fiche);

                        $this->getStructureService()->update($structureTMP);

                    }

                }

            }

        }

module/Application/src/Application/Controller/FicheProfilController.php

+6 −1
Original line number Diff line number Diff line
@@ -70,9 +70,14 @@ class FicheProfilController extends AbstractActionController { 
    {

        $ficheprofil = $this->getFicheProfilService()->getRequestedFicheProfil($this);

        $structure = $ficheprofil->getStructure();



        $structures = $this->getStructureService()->getStructuresFilles($structure);

        $structures[] = $structure;

        $fichespostes = $this->getFichePosteService()->getFichesPostesByStructures($structures, true);



        $fichespostes = [];

        foreach ($structures as $structure) {

            foreach ($structure->getFichesPostesRecrutements() as $fichePoste) $fichespostes[$fichePoste->getId()] = $fichePoste;

        }



        $adresse = $this->getParametreService()->getParametreByCode('PROFIL_DE_RECRUTEMENT', 'ADRESSE_DEFAUT')->getValeur();

        $form = $this->getFicheProfilForm();

module/Application/src/Application/View/Helper/FichesPostesAsArrayViewHelper.php

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ use Zend\View\Helper\Partial; 
use Zend\View\Renderer\PhpRenderer;

use Zend\View\Resolver\TemplatePathStack;



//TODO parametrer DIPLSAYS

//TODO parametrer ALLOWED



class FichesPostesAsArrayViewHelper extends AbstractHelper
@@ -34,8 +33,9 @@ class FichesPostesAsArrayViewHelper extends AbstractHelper 
            'modification' => false,

            'action' => true,

        ];

        if (isset($options['displays']) AND isset($options['displays']['structure'])) $displays['structure'] = ($options['displays']['structure'] !== false);

        if (isset($options['displays']) AND isset($options['displays']['id'])) $displays['id'] = ($options['displays']['id'] === true);

        if (isset($options['displays']) AND isset($options['displays']['agent'])) $displays['agent'] = ($options['displays']['agent'] !== false);

        if (isset($options['displays']) AND isset($options['displays']['structure'])) $displays['structure'] = ($options['displays']['structure'] !== false);



        return $view->partial('fiches-postes-as-table', ['fiches' => $fiches, 'structure' => $structure, 'displays' => $displays, 'options' => $options]);

    }

module/Mailing/src/Mailing/Service/Mailing/MailingService.php

+1 −1
Original line number Diff line number Diff line
@@ -257,7 +257,7 @@ class MailingService 
        $this->create($mail);





        $sujet = '[EMC2] ' . $subject;

        $sujet = '['.$name.'] ' . $subject;

        if ($this->doNotSend) {

            $sujet .= ' {REDIR}';

        }