From b344831a39a102c721eda301bef219e7a64854af Mon Sep 17 00:00:00 2001
From: Simon Vieille <simon@deblan.fr>
Date: Fri, 9 Jul 2021 21:22:04 +0200
Subject: [PATCH] add routes options

---
 .../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 +-
 .../views/site/page_admin/_form.html.twig     |  2 +-
 5 files changed, 18 insertions(+), 18 deletions(-)

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) %}
-                                <a href="{{ path(configuration.pageRoute('index')) }}" class="btn btn-light">
+                                <a href="{{ path(configuration.pageRoute('index'), configuration.pageRouteParams('index')) }}" class="btn btn-light">
                                     <span class="fa fa-list pr-1"></span>
                                     {{ configuration.actionTitle(context, 'back', 'Back to the list')|trans }}
                                 </a>
                             {% endif %}
 
                             {% if configuration.action(context, 'show', true) %}
-                                <a href="{{ path(configuration.pageRoute('show'), {entity: entity.id}) }}" class="btn btn-secondary">
+                                <a href="{{ path(configuration.pageRoute('show'), {entity: entity.id}|merge(configuration.pageRouteParams('show'))) }}" class="btn btn-secondary">
                                     <span class="fa fa-eye pr-1"></span>
                                     {{ configuration.actionTitle(context, 'show', 'Show')|trans|build_string(entity) }}
                                 </a>
@@ -87,7 +87,7 @@
     {% endblock %}
 
     {% if configuration.action(context, 'delete', true) %}
-        <form method="post" action="{{ path(configuration.pageRoute('delete'), {entity: entity.id}) }}" id="form-delete" data-form-confirm>
+        <form method="post" action="{{ path(configuration.pageRoute('delete'), {entity: entity.id}|merge(configuration.pageRouteParams('delete'))) }}" id="form-delete" data-form-confirm>
             <input type="hidden" name="_method" value="DELETE">
             <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ entity.id) }}">
         </form>
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 @@
             </button>
         </div>
         <div class="modal-body">
-            <form action="{{ path(configuration.pageRoute('index')) }}" id="form-filters" method="GET">
+            <form action="{{ path(configuration.pageRoute('index'), configuration.pageRouteParams('index')) }}" id="form-filters" method="GET">
                 {{ form_widget(form) }}
             </form>
         </div>
         <div class="modal-footer">
-            <a href="{{ path(configuration.pageRoute('index'), {(form.vars.name): 0}) }}" class="btn btn-secondary">{{ 'Reset'|trans }}</a>
+            <a href="{{ path(configuration.pageRoute('index'), {(form.vars.name): 0}|merge(configuration.pageRouteParams('index'))) }}" class="btn btn-secondary">{{ 'Reset'|trans }}</a>
             <button type="submit" form="form-filters" class="btn btn-primary">{{ 'Filter'|trans }}</button>
         </div>
     </div>
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) %}
-                                <a href="{{ path(configuration.pageRoute('new')) }}" class="btn btn-primary">
+                                <a href="{{ path(configuration.pageRoute('new'), configuration.pageRouteParams('new')) }}" class="btn btn-primary">
                                     <span class="fa fa-plus pr-1"></span>
                                     {{ configuration.actionTitle(context, 'new', 'New')|trans }}
                                 </a>
@@ -64,7 +64,7 @@
                 {% if filters.show %}
                     <div class="row pb-3">
                         <div class="col-auto ml-auto {% if pager.getPaginationData.pageCount > 1 %}mr-3{% endif %}">
-                            <button data-modal="{{ path(configuration.pageRoute('filter')) }}" class="btn btn-sm btn-secondary">
+                            <button data-modal="{{ path(configuration.pageRoute('filter'), configuration.pageRouteParams('filter')) }}" class="btn btn-sm btn-secondary">
                                 {{ 'Filter'|trans }} {% if not filters.isEmpty %}({{ 'yes'|trans }}){% endif %}
                             </button>
                         </div>
@@ -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) %}
-                                            <a href="{{ path(configuration.pageRoute('show'), {entity: item.id}) }}" class="btn btn-sm btn-secondary mr-1">
+                                            <a href="{{ path(configuration.pageRoute('show'), {entity: item.id}|merge(configuration.pageRouteParams('show'))) }}" class="btn btn-sm btn-secondary mr-1">
                                                 <span class="fa fa-eye"></span>
                                             </a>
                                         {% endif %}
 
                                         {% if configuration.action(context, 'edit', true) %}
-                                            <a href="{{ path(configuration.pageRoute('edit'), {entity: item.id}) }}" class="btn btn-sm btn-primary mr-1">
+                                            <a href="{{ path(configuration.pageRoute('edit'), {entity: item.id}|merge(configuration.pageRouteParams('edit'))) }}" class="btn btn-sm btn-primary mr-1">
                                                 <span class="fa fa-edit"></span>
                                             </a>
                                         {% endif %}
@@ -225,7 +225,7 @@
                                                 <span class="fa fa-trash"></span>
                                             </button>
 
-                                            <form method="post" action="{{ path(configuration.pageRoute('delete'), {entity: item.id}) }}" id="form-delete-{{ item.id }}" data-form-confirm>
+                                            <form method="post" action="{{ path(configuration.pageRoute('delete'), {entity: item.id}|merge(configuration.pageRouteParams('delete'))) }}" id="form-delete-{{ item.id }}" data-form-confirm>
                                                 <input type="hidden" name="_method" value="DELETE">
                                                 <input type="hidden" name="_token" value="{{ csrf_token('delete' ~ item.id) }}">
                                             </form>
@@ -256,7 +256,7 @@
 
                                             {% if configuration.hasBatchAction(context) %}
                                                 <div class="mb-2">
-                                                    <form class="form-inline" action="{{ path(configuration.pageRoute('batch'), {page: pager.currentPageNumber}) }}" id="form-batch" method="POST">
+                                                    <form class="form-inline" action="{{ path(configuration.pageRoute('batch'), {page: pager.currentPageNumber}|merge(configuration.pageRouteParams('batch'))) }}" id="form-batch" method="POST">
                                                         <select class="form-control my-1 mr-sm-2" name="batch[target]">
                                                             <option value="selection">{{ 'For selection'|trans }}</option>
                                                             <option value="all">{{ 'For all items'|trans }}</option>
diff --git a/core/Resources/views/admin/crud/new.html.twig b/core/Resources/views/admin/crud/new.html.twig
index 4ff039f..eef4a76 100644
--- a/core/Resources/views/admin/crud/new.html.twig
+++ b/core/Resources/views/admin/crud/new.html.twig
@@ -18,7 +18,7 @@
                             {% block header_actions_before %}{% endblock %}
 
                             {% if configuration.action(context, 'back', true) %}
-                                <a href="{{ path(configuration.pageRoute('index')) }}" class="btn btn-light">
+                                <a href="{{ path(configuration.pageRoute('index'), configuration.pageRouteParams('index')) }}" class="btn btn-light">
                                     <span class="fa fa-list pr-1"></span>
                                     {{ configuration.actionTitle(context, 'back', 'Back to the list')|trans }}
                                 </a>
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 %}