Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Use native Twig references for templates #9726

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

Merged
pamil merged 6 commits into from
Oct 2, 2018
Merged

Use native Twig references for templates #9726

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0165b11
Use native Twig references for templates
wadjeroudi Sep 24, 2018
d481028
use native twig reference in twig templates too (extends / imports...)
wadjeroudi Sep 24, 2018
f3bf1eb
use native twig reference for global crud templates in yml
wadjeroudi Sep 24, 2018
663f47f
fix wrong routing taxon template declaration syntax
wadjeroudi Sep 24, 2018
41e7a7f
reset wrong controller auto replace mismatch
wadjeroudi Sep 25, 2018
f331e4a
fix wrong replace native twig in checkout complete template
wadjeroudi Sep 26, 2018
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
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/Controller/DashboardController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public function indexAction(Request $request): Response
$statistics = $this->statisticsProvider->getStatisticsForChannel($channel);

return $this->templatingEngine->renderResponse(
'SyliusAdminBundle:Dashboard:index.html.twig',
'@SyliusAdmin/Dashboard/index.html.twig',
['statistics' => $statistics, 'channel' => $channel]
);
}
Expand Down
2 changes: 1 addition & 1 deletion src/Sylius/Bundle/AdminBundle/Resources/config/app/sylius/sylius_mailer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ sylius_mailer:
emails:
shipment_confirmation:
subject: sylius.emails.shipment_confirmation.subject
template: "SyliusAdminBundle:Email:shipmentConfirmation.html.twig"
template: "@SyliusAdmin/Email/shipmentConfirmation.html.twig"
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/admin_user.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ sylius_admin_admin_user:
alias: sylius.admin_user
section: admin
path: users
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
Copy link
Contributor

@teohhanhui teohhanhui Sep 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought it should be a forward slash, not a backslash?

Copy link
Contributor Author

@wadjeroudi wadjeroudi Sep 26, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@teohhanhui took me a while to figure it out, the / does escape the content of the route. Tried a lot of combination.
The only working solution (tested) was that.

Copy link
Contributor

@pamil pamil Oct 2, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think it might be connected with symfony/symfony#23412.

except: ['show']
redirect: index
grid: sylius_admin_admin_user
Expand All @@ -12,7 +12,7 @@ sylius_admin_admin_user:
all:
subheader: sylius.ui.manage_users_able_to_access_administration_panel
templates:
form: SyliusAdminBundle:AdminUser:_form.html.twig
form: "@SyliusAdmin/AdminUser/_form.html.twig"
index:
icon: lock
type: sylius.resource
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/channel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_channel:
resource: |
alias: sylius.channel
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show']
redirect: update
grid: sylius_admin_channel
Expand All @@ -11,7 +11,7 @@ sylius_admin_channel:
all:
subheader: sylius.ui.configure_channels_available_in_your_store
templates:
form: SyliusAdminBundle:Channel:_form.html.twig
form: "@SyliusAdmin/Channel/_form.html.twig"
index:
icon: share alternate
type: sylius.resource
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/country.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_country:
resource: |
alias: sylius.country
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show', 'delete']
redirect: update
grid: sylius_admin_country
Expand All @@ -11,7 +11,7 @@ sylius_admin_country:
all:
subheader: sylius.ui.manage_shipping_destinations
templates:
form: SyliusAdminBundle:Country:_form.html.twig
form: "@SyliusAdmin/Country/_form.html.twig"
index:
icon: flag
type: sylius.resource
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/currency.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_currency:
resource: |
alias: sylius.currency
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show', 'delete']
redirect: update
grid: sylius_admin_currency
Expand All @@ -11,7 +11,7 @@ sylius_admin_currency:
all:
subheader: sylius.ui.manage_currencies_available_in_the_store
templates:
form: SyliusAdminBundle:Currency:_form.html.twig
form: "@SyliusAdmin/Currency/_form.html.twig"
index:
icon: dollar
type: sylius.resource
6 changes: 3 additions & 3 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_customer:
resource: |
alias: sylius.customer
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show', 'delete']
redirect: update
grid: sylius_admin_customer
Expand All @@ -11,7 +11,7 @@ sylius_admin_customer:
all:
subheader: sylius.ui.manage_your_customers
templates:
form: SyliusAdminBundle:Customer:_form.html.twig
form: "@SyliusAdmin/Customer/_form.html.twig"
index:
icon: users
type: sylius.resource
Expand All @@ -22,7 +22,7 @@ sylius_admin_customer_show:
_controller: sylius.controller.customer:showAction
_sylius:
section: admin
template: SyliusAdminBundle:Customer:show.html.twig
template: "@SyliusAdmin/Customer/show.html.twig"
permission: true

sylius_admin_customer_order_index:
Expand Down
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/customer_group.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_customer_group:
resource: |
alias: sylius.customer_group
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show']
redirect: update
grid: sylius_admin_customer_group
Expand All @@ -12,7 +12,7 @@ sylius_admin_customer_group:
header: sylius.ui.customer_groups
subheader: sylius.ui.manage_customer_groups
templates:
form: SyliusAdminBundle:CustomerGroup:_form.html.twig
form: "@SyliusAdmin/CustomerGroup/_form.html.twig"
index:
icon: archive
type: sylius.resource
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/exchange_rate.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_exchange_rate:
resource: |
alias: sylius.exchange_rate
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show']
redirect: update
grid: sylius_admin_exchange_rate
Expand All @@ -11,7 +11,7 @@ sylius_admin_exchange_rate:
all:
subheader: sylius.ui.manage_exchange_rates
templates:
form: SyliusAdminBundle:ExchangeRate:_form.html.twig
form: "@SyliusAdmin/ExchangeRate/_form.html.twig"
index:
icon: sliders
type: sylius.resource
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/locale.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_locale:
resource: |
alias: sylius.locale
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show', 'delete']
redirect: index
grid: sylius_admin_locale
Expand All @@ -11,7 +11,7 @@ sylius_admin_locale:
all:
subheader: sylius.ui.manage_languages_available_in_the_store
templates:
form: SyliusAdminBundle:Locale:_form.html.twig
form: "@SyliusAdmin/Locale/_form.html.twig"
index:
icon: translate
type: sylius.resource
8 changes: 4 additions & 4 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/order.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_order:
resource: |
alias: sylius.order
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
only: ['index']
grid: sylius_admin_order
permission: true
Expand All @@ -21,7 +21,7 @@ sylius_admin_order_show:
_sylius:
section: admin
permission: true
template: SyliusAdminBundle:Order:show.html.twig
template: "@SyliusAdmin/Order/show.html.twig"

sylius_admin_order_history:
path: /orders/{id}/history
Expand All @@ -31,7 +31,7 @@ sylius_admin_order_history:
_sylius:
section: admin
permission: true
template: SyliusAdminBundle:Order:history.html.twig
template: "@SyliusAdmin/Order/history.html.twig"

sylius_admin_order_update:
path: /orders/{id}/edit
Expand All @@ -41,7 +41,7 @@ sylius_admin_order_update:
_sylius:
section: admin
permission: true
template: SyliusAdminBundle:Order:update.html.twig
template: "@SyliusAdmin/Order/update.html.twig"
form:
options:
validation_groups:
Expand Down
10 changes: 5 additions & 5 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/payment_method.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_payment_method:
resource: |
alias: sylius.payment_method
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show']
redirect: update
grid: sylius_admin_payment_method
Expand All @@ -11,7 +11,7 @@ sylius_admin_payment_method:
all:
subheader: sylius.ui.manage_payment_methods_available_to_your_customers
templates:
form: SyliusAdminBundle:PaymentMethod:_form.html.twig
form: "@SyliusAdmin/PaymentMethod/_form.html.twig"
index:
icon: payment
type: sylius.resource
Expand All @@ -27,13 +27,13 @@ sylius_admin_payment_method_create:
method: createWithGateway
arguments:
gatewayFactory: $factory
template: SyliusAdminBundle:Crud:create.html.twig
template: "@SyliusAdmin/Crud/create.html.twig"
redirect: sylius_admin_payment_method_update
permission: true
vars:
subheader: sylius.ui.manage_payment_methods_available_to_your_customers
templates:
form: SyliusAdminBundle:PaymentMethod:_form.html.twig
form: "@SyliusAdmin/PaymentMethod/_form.html.twig"
route:
parameters:
factory: $factory
Expand All @@ -43,4 +43,4 @@ sylius_admin_get_payment_gateways:
methods: [GET]
defaults:
_controller: sylius.controller.payment_method:getPaymentGatewaysAction
template: SyliusAdminBundle:PaymentMethod/Gateways:paymentGateways.html.twig
template: "@SyliusAdmin/PaymentMethod/Gateways/paymentGateways.html.twig"
16 changes: 8 additions & 8 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/product.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_product:
resource: |
alias: sylius.product
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show', 'index']
redirect: update
grid: sylius_admin_product
Expand All @@ -11,7 +11,7 @@ sylius_admin_product:
all:
subheader: sylius.ui.manage_your_product_catalog
templates:
form: SyliusAdminBundle:Product:_form.html.twig
form: "@SyliusAdmin/Product/_form.html.twig"
index:
icon: cube
type: sylius.resource
Expand All @@ -25,7 +25,7 @@ sylius_admin_product_index:
section: admin
permission: true
grid: sylius_admin_product
template: SyliusAdminBundle:Product:index.html.twig
template: "@SyliusAdmin/Product/index.html.twig"
vars:
subheader: sylius.ui.manage_your_product_catalog
icon: cube
Expand All @@ -39,7 +39,7 @@ sylius_admin_product_per_taxon_index:
section: admin
permission: true
grid: sylius_admin_product_from_taxon
template: SyliusAdminBundle:Product:index.html.twig
template: "@SyliusAdmin/Product/index.html.twig"
vars:
subheader: sylius.ui.manage_your_product_catalog
icon: cube
Expand All @@ -52,12 +52,12 @@ sylius_admin_product_create:
_sylius:
section: admin
permission: true
template: SyliusAdminBundle:Crud:create.html.twig
template: "@SyliusAdmin/Crud/create.html.twig"
redirect: sylius_admin_product_update
vars:
subheader: sylius.ui.manage_your_product_catalog
templates:
form: SyliusAdminBundle:Product:_form.html.twig
form: "@SyliusAdmin/Product/_form.html.twig"
route:
name: sylius_admin_product_create

Expand All @@ -71,11 +71,11 @@ sylius_admin_product_create_simple:
permission: true
factory:
method: createWithVariant
template: SyliusAdminBundle:Crud:create.html.twig
template: "@SyliusAdmin/Crud/create.html.twig"
redirect: sylius_admin_product_update
vars:
subheader: sylius.ui.manage_your_product_catalog
templates:
form: SyliusAdminBundle:Product:_form.html.twig
form: "@SyliusAdmin/Product/_form.html.twig"
route:
name: sylius_admin_product_create_simple
4 changes: 2 additions & 2 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_association_type.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,15 @@ sylius_admin_product_association_type:
alias: sylius.product_association_type
section: admin
permission: true
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show']
redirect: update
grid: sylius_admin_product_association_type
vars:
all:
subheader: sylius.ui.manage_association_types_of_your_products
templates:
form: SyliusAdminBundle:ProductAssociationType:_form.html.twig
form: "@SyliusAdmin/ProductAssociationType/_form.html.twig"
index:
icon: tasks
type: sylius.resource
14 changes: 7 additions & 7 deletions src/Sylius/Bundle/AdminBundle/Resources/config/routing/product_attribute.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ sylius_admin_product_attribute:
resource: |
alias: sylius.product_attribute
section: admin
templates: SyliusAdminBundle:Crud
templates: "@SyliusAdmin\\Crud"
except: ['show', 'create']
redirect: update
grid: sylius_admin_product_attribute
Expand All @@ -11,7 +11,7 @@ sylius_admin_product_attribute:
all:
subheader: sylius.ui.manage_attributes_of_your_products
templates:
form: SyliusAdminBundle:ProductAttribute:_form.html.twig
form: "@SyliusAdmin/ProductAttribute/_form.html.twig"
index:
icon: cubes
type: sylius.resource
Expand All @@ -27,13 +27,13 @@ sylius_admin_product_attribute_create:
method: createTyped
arguments:
type: $type
template: SyliusAdminBundle:Crud:create.html.twig
template: "@SyliusAdmin/Crud/create.html.twig"
redirect: sylius_admin_product_attribute_update
permission: true
vars:
subheader: sylius.ui.manage_attributes_of_your_products
templates:
form: SyliusAdminBundle:ProductAttribute:_form.html.twig
form: "@SyliusAdmin/ProductAttribute/_form.html.twig"
route:
parameters:
type: $type
Expand All @@ -43,18 +43,18 @@ sylius_admin_get_attribute_types:
methods: [GET]
defaults:
_controller: sylius.controller.product_attribute:getAttributeTypesAction
template: SyliusAdminBundle:ProductAttribute/Types:attributeTypes.html.twig
template: "@SyliusAdmin/ProductAttribute/Types/attributeTypes.html.twig"

sylius_admin_get_product_attributes:
path: /attributes
methods: [GET]
defaults:
_controller: sylius.controller.product_attribute:renderAttributesAction
template: SyliusAdminBundle:Product/Attribute:attributeChoice.html.twig
template: "@SyliusAdmin/Product/Attribute/attributeChoice.html.twig"

sylius_admin_render_attribute_forms:
path: /attribute-forms
methods: [GET]
defaults:
_controller: sylius.controller.product_attribute:renderAttributeValueFormsAction
template: SyliusAdminBundle:Product/Attribute:attributeValues.html.twig
template: "@SyliusAdmin/Product/Attribute/attributeValues.html.twig"
Loading