Commit 4b9fe910 authored by Thomas Hamel's avatar Thomas Hamel
Browse files

Merge branch 'feature_import_domaine_hal' into release_8.1.0

parents 58b6ea4d 3be984b2

module/Application/src/Application/Service/DomaineHal/DomaineHalService.php

+1 −0
Changes for module/Application/src/Application/Service/DomaineHal/DomaineHalService.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -76,6 +76,7 @@ class DomaineHalService { 
                "options" => $group["options"]

            ];

        }



        return $valueOptions;

    }

module/Depot/src/Depot/Controller/DepotController.php

+0 −4
Changes for module/Depot/src/Depot/Controller/DepotController.php: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -1427,10 +1427,6 @@ class DepotController extends AbstractController 
        if ($this->getRequest()->isPost()) {

            /** @var ParametersInterface $post */

            $post = $this->getRequest()->getPost();

            //Permet de gérer le cas où aucune sélection n'est effectuée (afin de passer dans l'hydrateur)

            if (!isset($post['domaineHal'])) {

                $post['domaineHal'] = array("domaineHal" => array(""));

            }

            $form->setData($post);

            if ($form->isValid()) {

                /** @var MetadonneeThese $metadonnee */

module/Depot/src/Depot/Form/Description/DescriptionTheseForm.php

+1 −0
Changes for module/Depot/src/Depot/Form/Description/DescriptionTheseForm.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ class DescriptionTheseForm extends Form 


        $domainesHalFieldset = $this->getFormFactory()->getFormElementManager()->get(DomaineHalFieldset::class);

        $domainesHalFieldset->setName("domaineHal");

        $domainesHalFieldset->setDomainesHalRequired(true);



        $this->add($domainesHalFieldset);

module/These/src/These/Controller/DomaineHalSaisieController.php

+1 −1
Changes for module/These/src/These/Controller/DomaineHalSaisieController.php: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class DomaineHalSaisieController extends AbstractActionController 
        $these = $this->getTheseService()->getRepository()->find($theseId);



        $form = $this->getDomaineHalSaisieForm();

        $domainesHal = $this->domaineHalService->getDomainesHalAsOptions('docId');

        $domainesHal = $this->domaineHalService->getDomainesHalAsOptions();

        $form->get('domaineHalFieldset')->setDomainesHal($domainesHal);

        $form->setAttribute('action', $this->url()->fromRoute('these/saisie-domaine-hal', ['these' => $these->getId()], [], true));

module/These/src/These/Form/DomaineHalSaisie/Fieldset/DomaineHalFieldset.php

+8 −1
Changes for module/These/src/These/Form/DomaineHalSaisie/Fieldset/DomaineHalFieldset.php: 8 added lines, 1 removed line.
Original line number Diff line number Diff line
@@ -9,6 +9,8 @@ use Laminas\InputFilter\InputFilterProviderInterface; 
class DomaineHalFieldset extends Fieldset implements InputFilterProviderInterface

{

    private ?array $domainesHal = null;

    private bool $domainesHalRequired = false;





    public function setDomainesHal($domainesHal): void

    {
@@ -16,6 +18,11 @@ class DomaineHalFieldset extends Fieldset implements InputFilterProviderInterfac 
        $this->get('domaineHal')->setValueOptions($this->domainesHal);

    }



    public function setDomainesHalRequired($domainesHalRequired)

    {

        $this->domainesHalRequired = (bool) $domainesHalRequired;

    }



    public function init()

    {

        $domaineHal = new Select('domaineHal', []);
@@ -38,7 +45,7 @@ class DomaineHalFieldset extends Fieldset implements InputFilterProviderInterfac 
    {

        return [

            'domaineHal' => [

                'required' => false,

                'required' => $this->domainesHalRequired,

            ],

        ];

    }