From 1f41798c38ad552e20aa6075834688a1fd01c751 Mon Sep 17 00:00:00 2001 From: Roshyo Date: Tue, 13 Oct 2020 19:29:58 +0200 Subject: [PATCH 1/2] Use new routing declaration instead of deprecated old one --- src/Resources/config/admin_routing.yml | 2 +- .../views/TableRateCrud/_weightLimitToRateTheme.html.twig | 4 ++-- src/Resources/views/TableRateCrud/create.html.twig | 4 ++-- src/Resources/views/TableRateCrud/index.html.twig | 2 +- src/Resources/views/TableRateCrud/update.html.twig | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Resources/config/admin_routing.yml b/src/Resources/config/admin_routing.yml index 916a7bf..048f5f3 100644 --- a/src/Resources/config/admin_routing.yml +++ b/src/Resources/config/admin_routing.yml @@ -2,8 +2,8 @@ webgriffe_sylius_table_rate_plugin_shipping_table_rate: resource: | alias: webgriffe.shipping_table_rate section: admin - templates: WebgriffeSyliusTableRateShippingPlugin:TableRateCrud except: ['show', 'bulkDelete'] + templates: '@WebgriffeSyliusTableRateShippingPlugin/TableRateCrud' redirect: update grid: webgriffe_sylius_table_rate_plugin_shipping_table_rate vars: diff --git a/src/Resources/views/TableRateCrud/_weightLimitToRateTheme.html.twig b/src/Resources/views/TableRateCrud/_weightLimitToRateTheme.html.twig index c16aa5f..02e273d 100644 --- a/src/Resources/views/TableRateCrud/_weightLimitToRateTheme.html.twig +++ b/src/Resources/views/TableRateCrud/_weightLimitToRateTheme.html.twig @@ -1,7 +1,7 @@ -{% extends 'SyliusAdminBundle:Form:theme.html.twig' %} +{% extends '@SyliusAdmin/Form/theme.html.twig' %} {% block _webgriffe_sylius_table_rate_plugin_shipping_table_rate_weightLimitToRate_widget %} - {% from 'SyliusResourceBundle:Macros:notification.html.twig' import error %} + {% from '@SyliusResource/Macros/notification.html.twig' import error %} {% import _self as self %} {% set attr = attr|merge({'class': attr.class|default ~ ' controls collection-widget'}) %} diff --git a/src/Resources/views/TableRateCrud/create.html.twig b/src/Resources/views/TableRateCrud/create.html.twig index 9654c0b..e10cde1 100644 --- a/src/Resources/views/TableRateCrud/create.html.twig +++ b/src/Resources/views/TableRateCrud/create.html.twig @@ -1,4 +1,4 @@ -{% extends 'SyliusAdminBundle:Crud:create.html.twig' %} +{% extends '@SyliusAdmin/Crud/create.html.twig' %} -{% form_theme form.weightLimitToRate 'WebgriffeSyliusTableRateShippingPlugin:TableRateCrud:_weightLimitToRateTheme.html.twig' %} +{% form_theme form.weightLimitToRate '@WebgriffeSyliusTableRateShippingPlugin/TableRateCrud/_weightLimitToRateTheme.html.twig' %} diff --git a/src/Resources/views/TableRateCrud/index.html.twig b/src/Resources/views/TableRateCrud/index.html.twig index 2442b25..90f6f85 100644 --- a/src/Resources/views/TableRateCrud/index.html.twig +++ b/src/Resources/views/TableRateCrud/index.html.twig @@ -1 +1 @@ -{% extends 'SyliusAdminBundle:Crud:index.html.twig' %} +{% extends '@SyliusAdmin/Crud/index.html.twig' %} diff --git a/src/Resources/views/TableRateCrud/update.html.twig b/src/Resources/views/TableRateCrud/update.html.twig index 8443f77..29585a8 100644 --- a/src/Resources/views/TableRateCrud/update.html.twig +++ b/src/Resources/views/TableRateCrud/update.html.twig @@ -1,3 +1,3 @@ -{% extends 'SyliusAdminBundle:Crud:update.html.twig' %} +{% extends '@SyliusAdmin/Crud/update.html.twig' %} -{% form_theme form.weightLimitToRate 'WebgriffeSyliusTableRateShippingPlugin:TableRateCrud:_weightLimitToRateTheme.html.twig' %} +{% form_theme form.weightLimitToRate '@WebgriffeSyliusTableRateShippingPlugin/TableRateCrud/_weightLimitToRateTheme.html.twig' %} From 0b43f97b106779e681d07357d04a1f8a7ffe4b41 Mon Sep 17 00:00:00 2001 From: Roshyo Date: Tue, 13 Oct 2020 19:29:58 +0200 Subject: [PATCH 2/2] Use new routing declaration instead of deprecated old one --- src/Resources/config/admin_routing.yml | 2 +- .../views/TableRateCrud/_weightLimitToRateTheme.html.twig | 4 ++-- src/Resources/views/TableRateCrud/create.html.twig | 4 ++-- src/Resources/views/TableRateCrud/index.html.twig | 2 +- src/Resources/views/TableRateCrud/update.html.twig | 4 ++-- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Resources/config/admin_routing.yml b/src/Resources/config/admin_routing.yml index 916a7bf..048f5f3 100644 --- a/src/Resources/config/admin_routing.yml +++ b/src/Resources/config/admin_routing.yml @@ -2,8 +2,8 @@ webgriffe_sylius_table_rate_plugin_shipping_table_rate: resource: | alias: webgriffe.shipping_table_rate section: admin - templates: WebgriffeSyliusTableRateShippingPlugin:TableRateCrud except: ['show', 'bulkDelete'] + templates: '@WebgriffeSyliusTableRateShippingPlugin/TableRateCrud' redirect: update grid: webgriffe_sylius_table_rate_plugin_shipping_table_rate vars: diff --git a/src/Resources/views/TableRateCrud/_weightLimitToRateTheme.html.twig b/src/Resources/views/TableRateCrud/_weightLimitToRateTheme.html.twig index c16aa5f..02e273d 100644 --- a/src/Resources/views/TableRateCrud/_weightLimitToRateTheme.html.twig +++ b/src/Resources/views/TableRateCrud/_weightLimitToRateTheme.html.twig @@ -1,7 +1,7 @@ -{% extends 'SyliusAdminBundle:Form:theme.html.twig' %} +{% extends '@SyliusAdmin/Form/theme.html.twig' %} {% block _webgriffe_sylius_table_rate_plugin_shipping_table_rate_weightLimitToRate_widget %} - {% from 'SyliusResourceBundle:Macros:notification.html.twig' import error %} + {% from '@SyliusResource/Macros/notification.html.twig' import error %} {% import _self as self %} {% set attr = attr|merge({'class': attr.class|default ~ ' controls collection-widget'}) %} diff --git a/src/Resources/views/TableRateCrud/create.html.twig b/src/Resources/views/TableRateCrud/create.html.twig index 9654c0b..e10cde1 100644 --- a/src/Resources/views/TableRateCrud/create.html.twig +++ b/src/Resources/views/TableRateCrud/create.html.twig @@ -1,4 +1,4 @@ -{% extends 'SyliusAdminBundle:Crud:create.html.twig' %} +{% extends '@SyliusAdmin/Crud/create.html.twig' %} -{% form_theme form.weightLimitToRate 'WebgriffeSyliusTableRateShippingPlugin:TableRateCrud:_weightLimitToRateTheme.html.twig' %} +{% form_theme form.weightLimitToRate '@WebgriffeSyliusTableRateShippingPlugin/TableRateCrud/_weightLimitToRateTheme.html.twig' %} diff --git a/src/Resources/views/TableRateCrud/index.html.twig b/src/Resources/views/TableRateCrud/index.html.twig index 2442b25..90f6f85 100644 --- a/src/Resources/views/TableRateCrud/index.html.twig +++ b/src/Resources/views/TableRateCrud/index.html.twig @@ -1 +1 @@ -{% extends 'SyliusAdminBundle:Crud:index.html.twig' %} +{% extends '@SyliusAdmin/Crud/index.html.twig' %} diff --git a/src/Resources/views/TableRateCrud/update.html.twig b/src/Resources/views/TableRateCrud/update.html.twig index 8443f77..29585a8 100644 --- a/src/Resources/views/TableRateCrud/update.html.twig +++ b/src/Resources/views/TableRateCrud/update.html.twig @@ -1,3 +1,3 @@ -{% extends 'SyliusAdminBundle:Crud:update.html.twig' %} +{% extends '@SyliusAdmin/Crud/update.html.twig' %} -{% form_theme form.weightLimitToRate 'WebgriffeSyliusTableRateShippingPlugin:TableRateCrud:_weightLimitToRateTheme.html.twig' %} +{% form_theme form.weightLimitToRate '@WebgriffeSyliusTableRateShippingPlugin/TableRateCrud/_weightLimitToRateTheme.html.twig' %}