[Template][Events] Changed names of events

[Template][Events] Changed names of events [Template][Events] Changed names of events [Template][Events] Changed names of events order changed fix BC fix render rest
Sylius · Jun 23, 2022 · 76208b4 · 76208b4
1 parent 26180fc
commit 76208b4
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 15 deletions.
diff --git a/src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml b/src/Sylius/Bundle/AdminBundle/Resources/config/app/events.yaml
@@ -236,28 +236,28 @@ sylius_ui:
                     context:
                         event: sylius.admin.layout.topbar_right
 
-        sylius.admin.grid.filters:
-            blocks:
-                content:
-                    template: "@SyliusUi/Grid/Filter/_content.html.twig"
-                    priority: 10
-
-        sylius.admin.grid.content:
+        sylius.grid:
             blocks:
                 content:
                     template: "@SyliusUi/Grid/_content.html.twig"
                     priority: 10
 
-        sylius.admin.grid.body:
+        sylius.grid.body:
             blocks:
                 navigation:
-                    template: "@SyliusUi/Grid/_navigation.html.twig"
+                    template: "@SyliusUi/Grid/Body/_navigation.html.twig"
                     priority: 30
                 table:
-                    template: "@SyliusUi/Grid/_table.html.twig"
+                    template: "@SyliusUi/Grid/Body/_table.html.twig"
                     priority: 20
                 pagination:
-                    template: "@SyliusUi/Grid/_pagination.html.twig"
+                    template: "@SyliusUi/Grid/Body/_pagination.html.twig"
+                    priority: 10
+
+        sylius.grid.filters:
+            blocks:
+                content:
+                    template: "@SyliusUi/Grid/Filter/_content.html.twig"
                     priority: 10
 
         sylius.admin.order.update.form:

diff --git a/...esources/views/Grid/_navigation.html.twig → ...ces/views/Grid/Body/_navigation.html.twig b/...esources/views/Grid/_navigation.html.twig → ...ces/views/Grid/Body/_navigation.html.twig
diff --git a/...esources/views/Grid/_pagination.html.twig → ...ces/views/Grid/Body/_pagination.html.twig b/...esources/views/Grid/_pagination.html.twig → ...ces/views/Grid/Body/_pagination.html.twig
diff --git a/...dle/Resources/views/Grid/_table.html.twig → ...esources/views/Grid/Body/_table.html.twig b/...dle/Resources/views/Grid/_table.html.twig → ...esources/views/Grid/Body/_table.html.twig
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_content.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_content.html.twig
@@ -4,9 +4,9 @@
 {% set path = path(app.request.attributes.get('_route'), app.request.attributes.get('_route_params')) %}
 {% set criteria = app.request.query.get('criteria') %}
 
-{{ sylius_template_event('sylius.admin.grid.filters', _context) }}
+{{ sylius_template_event('sylius.grid.filters', _context) }}
 
 <div class="ui hidden divider"></div>
 <div class="sylius-grid-wrapper">
-    {{ sylius_template_event('sylius.admin.grid.body', _context) }}
+    {{ sylius_template_event('sylius.grid.body', _context) }}
 </div>
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_default.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Grid/_default.html.twig
@@ -1 +1 @@
-{{ sylius_template_event('sylius.admin.grid.content', _context) }}
+{{ sylius_template_event('sylius.grid', _context) }}
diff --git a/src/Sylius/Bundle/UiBundle/Resources/views/Security/_login.html.twig b/src/Sylius/Bundle/UiBundle/Resources/views/Security/_login.html.twig
@@ -8,6 +8,8 @@
             <div class="ui left aligned very padded segment">
                 {{ sylius_template_event('sylius.admin.login.form.content', _context) }}
             </div>
-        {{ form_end(form) }}
+
+            {{ sylius_template_event('sylius.admin.login.form', _context) }}
+        {{ form_end(form, {'render_rest': false}) }}
     </div>
 </div>