Skip to content

fix(render form): properly display default values #359

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RomulusED69 wants to merge 1 commit into
base: 1.14
Choose a base branch
from
Open

fix(render form): properly display default values #359

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions docs/configuration.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ sylius_grid:
fields: { }
form_options:
type: contains # type of string filtering option, if you one to have just one
default_value: ~
default_value:
type: contains
value: example
enabled:
type: boolean # Type of filter
label: app.ui.enabled
Expand All @@ -53,7 +55,7 @@ sylius_grid:
options:
field: enabled
form_options: { }
default_value: ~
default_value: 'false'
date:
type: date # Type of filter
label: app.ui.created_at
Expand Down
17 changes: 14 additions & 3 deletions src/Bundle/Renderer/TwigGridRenderer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ public function renderFilter(GridViewInterface $gridView, Filter $filter)
{
$template = $this->getFilterTemplate($filter);

$form = $this->formFactory->createNamed('criteria', FormType::class, [], [
$form = $this->formFactory->createNamed('criteria', FormType::class, $this->getDefaultFormData($filter), [
'allow_extra_fields' => true,
'csrf_protection' => false,
'required' => false,
Expand All @@ -105,8 +105,10 @@ public function renderFilter(GridViewInterface $gridView, Filter $filter)
$filter->getFormOptions(),
);

$criteria = $gridView->getParameters()->get('criteria', []);
$form->submit($criteria);
if ($gridView->getParameters()->has('criteria')) {
$criteria = $gridView->getParameters()->get('criteria', []);
$form->submit($criteria);
}

return $this->twig->render($template, [
'grid' => $gridView,
Expand All @@ -132,4 +134,13 @@ private function getFilterTemplate(Filter $filter): string

return $this->filterTemplates[$type];
}

private function getDefaultFormData(Filter $filter): array
{
if (in_array($filter->getCriteria(), [null, '', []], true)) {
return [];
}

return [$filter->getName() => $filter->getCriteria()];
}
}