Skip to content

Commit 941af4b

Browse files
committed
LOOP-1224: Fixed handling of menu item urls
1 parent 10a3510 commit 941af4b

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

web/profiles/custom/os2loop/themes/os2loop_theme/templates/navigation/menu--main.html.twig

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,18 @@
3636
{% if menu_level == 0 %}
3737
<ul{{ attributes.addClass(['navbar-nav mr-auto']) }}>
3838
{% for item in items %}
39+
{% set route_name = item.url.routed ? item.url.routeName %}
3940
{% set classes_list_item = [
4041
'nav-item',
4142
item.below ? 'dropdown',
42-
] %}
43+
] %}
4344
{% set classes_link = [
4445
'nav-link',
45-
item.is_expanded and item.url.routeName == '<nolink>' ? 'dropdown-toggle',
46-
item.is_collapsed and item.url.routeName == '<nolink>' ? 'dropdown-toggle',
46+
route_name == '<nolink>' ? 'dropdown-toggle',
4747
item.in_active_trail ? 'active',
4848
] %}
4949
<li{{ item.attributes.addClass(classes_list_item) }}>
50-
{% if item.url.routed and item.url.routeName == '<nolink>' %}
50+
{% if route_name == '<nolink>' %}
5151
<a class="{{ classes_link|join(' ') }}" href="#" role="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
5252
{{ item.title }}
5353
</a>
@@ -65,10 +65,11 @@
6565
{% endif %}
6666
{% if menu_level == 1 %}
6767
{% for item in items %}
68+
{% set route_name = item.url.routed ? item.url.routeName %}
6869
{% set classes_link = [
69-
item.url.routeName != '<nolink>' ? 'dropdown-item',
70+
route_name != '<nolink>' ? 'dropdown-item',
7071
item.in_active_trail ? 'active',
71-
] %}
72+
] %}
7273
{{ link(item.title, item.url, {'class': classes_link}) }}
7374
{% endfor %}
7475
{% endif %}

0 commit comments

Comments
 (0)