Commit ad5cf6dd authored by Bertrand Gauthier's avatar Bertrand Gauthier
Browse files

Merge tag '6.0.12'

parents 844c12db f6f13332

CHANGELOG.md

+5 −0
Original line number Diff line number Diff line 
CHANGELOG

=========



6.0.12

------



- MultipageForm : ajout du passage de la variable formulaire à chaque vue d'étape, permettant d'appeler dans la vue la méthode prepare() indispensable.



6.0.11

-----

src/UnicaenApp/Controller/Plugin/MultipageFormPlugin.php

+3 −0
Original line number Diff line number Diff line
@@ -230,6 +230,7 @@ class MultipageFormPlugin extends AbstractPlugin 
            $currentFieldset->populateValues($this->getSessionValues($currentFieldset->getName()));



            return [

                'form'      => $this->form,

                'fieldset'  => $currentFieldset,

                'stepIndex' => $this->getCurrentStepIndex(),

                'stepCount' => $this->getStepCount()];
@@ -312,6 +313,7 @@ class MultipageFormPlugin extends AbstractPlugin 


                if (!$valid) {

                    return [

                        'form'      => $this->form,

                        'fieldset'  => $currentFieldset,

                        'stepIndex' => $this->getCurrentStepIndex(),

                        'stepCount' => $this->getStepCount()];
@@ -343,6 +345,7 @@ class MultipageFormPlugin extends AbstractPlugin 


                if (!$valid) {

                    return [

                        'form'      => $this->form,

                        'fieldset'  => $currentFieldset,

                        'stepIndex' => $this->getCurrentStepIndex(),

                        'stepCount' => $this->getStepCount()];

src/UnicaenApp/Filter/SearchAndSelectFilter.php

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<?php



namespace UnicaenApp\Filter;



use Laminas\Filter\AbstractFilter;

use UnicaenApp\Form\Element\SearchAndSelect;



class SearchAndSelectFilter extends AbstractFilter

{

    /**

     * @inheritDoc

     */

    public function filter($value)

    {

        if (!is_array($value)) {

            return $value;

        }



        if (!array_key_exists(SearchAndSelect::ID_ELEMENT_NAME, $value) || $value[SearchAndSelect::ID_ELEMENT_NAME] === '') {

            return null;

        }



        return $value;

    }

}
 
 No newline at end of file