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

Merge branch '2.0' into api-platform-3

Browse source 
* 2.0:
  Bump Twig Hooks to 0.3.x
  Disable sortable name field
  [Admin][Dashboard] Fix dropdown button
This commit is contained in:
Grzegorz Sadowski 2024-07-10 06:51:52 +02:00
commit e46f64c996
No known key found for this signature in database
GPG key ID: EF87FF4E6E3BD364
4 changed files with 24 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
composer.json
View file

@ -87,7 +87,7 @@
"sylius/resource": "^1.10",
"sylius/resource-bundle": "^1.10",
"sylius/theme-bundle": "^2.3",
"sylius/twig-hooks": "~0.2.4",
"sylius/twig-hooks": "~0.3.0",
"symfony/asset": "^6.4.0",
"symfony/cache-contracts": "^2.5 || ^3.0",
"symfony/clock": "^6.4.0",

1
src/Sylius/Bundle/AdminBundle/Resources/config/grids/locale.yml
View file

@ -12,7 +12,6 @@ sylius_grid:
type: twig
label: sylius.ui.name
path: .
sortable: code
options:
template: "@SyliusAdmin/locale/grid/field/name.html.twig"
code:

2
src/Sylius/Bundle/AdminBundle/composer.json
View file

@ -35,7 +35,7 @@
"knplabs/knp-menu-bundle": "^3.0",
"sylius/core-bundle": "^2.0",
"sylius/ui-bundle": "^2.0",
"sylius/twig-hooks": "~0.2.4",
"sylius/twig-hooks": "~0.3.0",
"symfony/framework-bundle": "^6.4.1",
"symfony/stimulus-bundle": "^2.12",
"symfony/ux-autocomplete": "^2.17",

42
src/Sylius/Bundle/AdminBundle/templates/dashboard/index/component/channel_selector.html.twig
View file

@ -1,24 +1,26 @@
{# Rendered with \Sylius\Bundle\AdminBundle\Twig\Component\Dashboard\ChannelSelectorComponent #}
<div class="d-flex justify-content-end" {{ attributes }}>
<div class="dropdown">
<a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false" {{ sylius_test_html_attribute('choose-channel-button') }}>
{{ channel_name }}
</a>
{% if channels|length > 1 %}
<div class="d-flex justify-content-end" {{ attributes }}>
<div class="dropdown">
<a class="btn btn-secondary dropdown-toggle" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false" {{ sylius_test_html_attribute('choose-channel-button') }}>
{{ channel_name }}
</a>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuLink" {{ sylius_test_html_attribute('choose-channel-list') }}>
{% for channel in channels %}
<li>
<a
class="dropdown-item"
data-action="live#action"
data-live-action-param="changeChannel"
data-live-channel-code-param="{{ channel.code }}"
>
{{ channel.name }}
</a>
</li>
{% endfor %}
</ul>
<ul class="dropdown-menu" aria-labelledby="dropdownMenuLink" {{ sylius_test_html_attribute('choose-channel-list') }}>
{% for channel in channels %}
<li>
<a
class="dropdown-item"
data-action="live#action"
data-live-action-param="changeChannel"
data-live-channel-code-param="{{ channel.code }}"
>
{{ channel.name }}
</a>
</li>
{% endfor %}
</ul>
</div>
</div>
</div>
{% endif %}