Commit 50741a43 authored by THEO GUILLON's avatar THEO GUILLON
Browse files

Merge branch...

Merge branch '625-bug-perte-des-filtres-dans-les-formulaires-lors-du-changement-de-page' into '2.1.2'

Resolve "Bug : perte des filtres dans les formulaires lors du changement de page"

See merge request libriciel/pole-citoyens/web-DPO/web-DPO!658
parents 1a68a3c2 b05e91ac
Pipeline #20315 passed with stage
in 2 minutes and 18 seconds
......@@ -249,8 +249,12 @@ class FormulairesController extends AppController
{
$this->set('title', __d('formulaire', 'formulaire.titreMesFormulairesOrganisation'));
$conditions[] = $this->Formulaire->getFormulaireConditionOrganisation(
$this->Session->read('Organisation.id')
);
$this->set([
'formulaires' => $this->_getSearchResults(),
'formulaires' => $this->_getSearchResults($conditions),
]);
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment