Commit b31f4d0b authored by Alexandre Zvenigorosky's avatar Alexandre Zvenigorosky
Browse files

Merge branch 'master' of https://git.unicaen.fr/open-source/OSE into Motif_Non_Paiement

# Conflicts:
#	code/template/GenerateRubrique/config_php
#	code/template/GenerateRubrique/controller_php
#	code/template/GenerateRubrique/idx1
parent 34e5b825
Loading
Loading
Loading
Loading
+2 −11
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ class CentreCoutStructureSaisieForm extends AbstractForm
    use CentreCoutStructureServiceAwareTrait;



    public function init()
    {
        $hydrator = new CentreCoutStructureHydrator();
@@ -46,10 +45,9 @@ class CentreCoutStructureSaisieForm extends AbstractForm
            ],
            'type' => 'Select',
        ]);

        $qb = $this->getServiceStructure()->finderByEnseignement();
        $this->get('structure')
            ->setEmptyOption("(Aucun)")
            ->setValueOptions(\UnicaenApp\Util::collectionAsOptions($this->getStructures()));
            ->setValueOptions(\UnicaenApp\Util::collectionAsOptions($this->getServiceStructure()->getList($qb)));

        $this->add(new Csrf('security'));
        $this->add([
@@ -65,7 +63,6 @@ class CentreCoutStructureSaisieForm extends AbstractForm
    }



    public function getStructures()
    {
        $serviceStructure = $this->getServiceStructure();
@@ -76,7 +73,6 @@ class CentreCoutStructureSaisieForm extends AbstractForm
    }



    /**
     * Should return an array specification compatible with
     * {@link Zend\InputFilter\Factory::createInputFilter()}.
@@ -100,9 +96,6 @@ class CentreCoutStructureSaisieForm extends AbstractForm
}





class CentreCoutStructureHydrator implements HydratorInterface
{
    use StructureServiceAwareTrait;
@@ -110,7 +103,6 @@ class CentreCoutStructureHydrator implements HydratorInterface
    use CentreCoutServiceAwareTrait;



    /**
     * Hydrate $object with the provided $data.
     *
@@ -130,7 +122,6 @@ class CentreCoutStructureHydrator implements HydratorInterface
    }



    /**
     * Extract values from an object
     *