From b76b9123e5bd90f2def31b2ed9646896f8fd1b59 Mon Sep 17 00:00:00 2001 From: Simon Vieille Date: Fri, 9 Jul 2021 23:42:27 +0200 Subject: [PATCH] backports murph-skeleton --- core/Crud/CrudConfiguration.php | 13 +++++++++++ core/Entity/Site/Page/Page.php | 10 ++++----- core/Form/Site/Page/PageType.php | 2 +- .../admin/crud/_form_translations.html.twig | 2 +- .../Resources/views/admin/crud/edit.html.twig | 6 ++--- .../views/admin/crud/filter.html.twig | 4 ++-- .../views/admin/crud/index.html.twig | 22 +++++++++---------- core/Resources/views/admin/crud/new.html.twig | 2 +- .../form/bootstrap_4_form_theme.html.twig | 6 ++--- .../views/site/page_admin/_form.html.twig | 2 +- 10 files changed, 41 insertions(+), 28 deletions(-) diff --git a/core/Crud/CrudConfiguration.php b/core/Crud/CrudConfiguration.php index 451e337..3bc0282 100644 --- a/core/Crud/CrudConfiguration.php +++ b/core/Crud/CrudConfiguration.php @@ -13,6 +13,7 @@ class CrudConfiguration { protected array $pageTitles = []; protected array $pageRoutes = []; + protected array $pageRouteParams = []; protected array $actions = []; protected array $batchActions = []; protected array $actionTitles = []; @@ -67,6 +68,18 @@ class CrudConfiguration return $this->pageRoutes[$page]; } + public function setPageRouteParams(string $page, array $params): self + { + $this->pageRouteParams[$page] = $params; + + return $this; + } + + public function getPageRouteParams(string $page): array + { + return $this->pageRouteParams[$page] ?? []; + } + /* -- */ public function setForm(string $context, string $form, array $options = []): self diff --git a/core/Entity/Site/Page/Page.php b/core/Entity/Site/Page/Page.php index f48602d..58280fd 100644 --- a/core/Entity/Site/Page/Page.php +++ b/core/Entity/Site/Page/Page.php @@ -53,7 +53,7 @@ class Page implements EntityInterface /** * @ORM\Column(type="string", length=255, nullable=true) */ - protected $metaDescrition; + protected $metaDescription; /** * @ORM\Column(type="string", length=255, nullable=true) @@ -192,14 +192,14 @@ class Page implements EntityInterface return $this; } - public function getMetaDescrition(): ?string + public function getMetaDescription(): ?string { - return $this->metaDescrition; + return $this->metaDescription; } - public function setMetaDescrition(?string $metaDescrition): self + public function setMetaDescription(?string $metaDescription): self { - $this->metaDescrition = $metaDescrition; + $this->metaDescription = $metaDescription; return $this; } diff --git a/core/Form/Site/Page/PageType.php b/core/Form/Site/Page/PageType.php index 5ac2eba..b6db1ad 100644 --- a/core/Form/Site/Page/PageType.php +++ b/core/Form/Site/Page/PageType.php @@ -44,7 +44,7 @@ class PageType extends AbstractType ); $builder->add( - 'metaDescrition', + 'metaDescription', TextType::class, [ 'label' => 'Description', diff --git a/core/Resources/views/admin/crud/_form_translations.html.twig b/core/Resources/views/admin/crud/_form_translations.html.twig index d0f8a6a..f89386e 100644 --- a/core/Resources/views/admin/crud/_form_translations.html.twig +++ b/core/Resources/views/admin/crud/_form_translations.html.twig @@ -16,7 +16,7 @@
{% for locale in configuration.locales %}
- {% for item in item.children[locale] %} + {% for item in form.children[locale] %} {% if not item.isRendered %} {% set doRender = true %} {% endif %} diff --git a/core/Resources/views/admin/crud/edit.html.twig b/core/Resources/views/admin/crud/edit.html.twig index 7008334..19d0c3d 100644 --- a/core/Resources/views/admin/crud/edit.html.twig +++ b/core/Resources/views/admin/crud/edit.html.twig @@ -18,14 +18,14 @@ {% block header_actions_before %}{% endblock %} {% if configuration.action(context, 'back', true) %} - + {{ configuration.actionTitle(context, 'back', 'Back to the list')|trans }} {% endif %} {% if configuration.action(context, 'show', true) %} - + {{ configuration.actionTitle(context, 'show', 'Show')|trans|build_string(entity) }} @@ -87,7 +87,7 @@ {% endblock %} {% if configuration.action(context, 'delete', true) %} -
+
diff --git a/core/Resources/views/admin/crud/filter.html.twig b/core/Resources/views/admin/crud/filter.html.twig index aca97ad..e8f7381 100644 --- a/core/Resources/views/admin/crud/filter.html.twig +++ b/core/Resources/views/admin/crud/filter.html.twig @@ -9,12 +9,12 @@
-
+ {{ form_widget(form) }}
- {{ 'Reset'|trans }} + {{ 'Reset'|trans }}
diff --git a/core/Resources/views/admin/crud/index.html.twig b/core/Resources/views/admin/crud/index.html.twig index 84684f1..a26035f 100644 --- a/core/Resources/views/admin/crud/index.html.twig +++ b/core/Resources/views/admin/crud/index.html.twig @@ -30,7 +30,7 @@ {% block header_actions_before %}{% endblock %} {% if configuration.action(context, 'new', true) %} - + {{ configuration.actionTitle(context, 'new', 'New')|trans }} @@ -64,7 +64,7 @@ {% if filters.show %}
-
@@ -113,12 +113,12 @@ {% set url = path(configuration.getPageRoute(context), { _sort: config.options.sort[0], _sort_direction: newDirection, - }) %} + }|merge(configuration.pageRouteParams(context))) %} {% else %} {% set url = path(configuration.getPageRoute(context), { _sort: config.options.sort[0], _sort_direction: 'asc', - }) %} + }|merge(configuration.pageRouteParams(context))) %} {% set icon = null %} {% endif %} @@ -155,7 +155,7 @@ _token: csrf_token('sort'), page: pager.currentPageNumber, context: context, - } + }|merge(configuration.pageRouteParams('sort')) ) ~ '"' %} {% else %} {% set dataSortable = '' %} @@ -173,9 +173,9 @@ {% block list_item %} {%- set dbClick %} {% if configuration.action(context, 'show', true) %} - {{ path(configuration.pageRoute('show'), {entity: item.id}) }} + {{ path(configuration.pageRoute('show'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }} {% elseif configuration.action(context, 'edit', true) %} - {{ path(configuration.pageRoute('edit'), {entity: item.id}) }} + {{ path(configuration.pageRoute('edit'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }} {% endif %} {% endset -%} @@ -209,13 +209,13 @@ {% block list_item_actions_before %}{% endblock %} {% if configuration.action(context, 'show', true) %} - + {% endif %} {% if configuration.action(context, 'edit', true) %} - + {% endif %} @@ -225,7 +225,7 @@ -
+
@@ -256,7 +256,7 @@ {% if configuration.hasBatchAction(context) %}
-
+ - + {{ 'Choose'|trans }} {% if value %} {% if value.pathname is defined %} - + {{ 'Download'|trans }} {% else %} - + {{ 'Download'|trans }} {% endif %} diff --git a/core/Resources/views/site/page_admin/_form.html.twig b/core/Resources/views/site/page_admin/_form.html.twig index 0421858..6254d32 100644 --- a/core/Resources/views/site/page_admin/_form.html.twig +++ b/core/Resources/views/site/page_admin/_form.html.twig @@ -1,5 +1,5 @@ {% set formMetas %} - {% for item in ['metaTitle', 'metaDescrition'] %} + {% for item in ['metaTitle', 'metaDescription'] %} {{ form_row(form[item]) }} {% endfor %} {% endset %}