kenaug74/Sylius
1
0
Fork 0
mirror of https://github.com/Sylius/Sylius.git synced 2026-07-14 17:10:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge branch '1.7'

Browse source 
* 1.7:
  Add symfony/form conflict
  Add Sylius template events
This commit is contained in:
Łukasz Chruściel 2020-06-16 08:44:56 +02:00
commit 450ddd15f0
No known key found for this signature in database
GPG key ID: 428B9D810DB2ACDF
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -188,7 +188,7 @@
"api-platform/core": "^2.5.5",
"doctrine/inflector": "^1.4",
"sylius/grid-bundle": "1.7.4",
"symfony/form": "4.4.9",
"symfony/form": "^4.4.9",
"symfony/symfony": "3.4.7",
"twig/twig": "2.6.1"
},

2
src/Sylius/Bundle/AdminBundle/Resources/views/Product/Tab/_inventory.html.twig
View file

@ -7,4 +7,6 @@
{{ form_row(form.variant.version) }}
{% endif %}
</div>
{{ sylius_template_event(['sylius.admin.product.' ~ action ~ '.tab_inventory', 'sylius.admin.product.tab_inventory'], {'form': form}) }}
</div>