entrouvert
/
combo
16
1
Fork 0
Code Issues Pull Requests 11 Releases Wiki Activity

templates: attach back page id into menu items (#41624)

This commit is contained in:
Frédéric Péters 2020-04-11 23:12:05 +02:00
parent efc784d4e1
commit a0c5e697a9
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
combo/public/templates/combo/menu.html
View File

@ -3,7 +3,7 @@
<ul>
{% spaceless %}
{% for menuitem in menuitems %}
<li data-menu-page-id="{{ menuitem.page_id }}" class="menu-{{ menuitem.page.slug }} {% if menuitem.selected %}selected{% endif %}"><a
<li data-menu-page-id="{{ menuitem.page.id }}" class="menu-{{ menuitem.page.slug }} {% if menuitem.selected %}selected{% endif %}"><a
{% if menuitem.selected %}title="{{ menuitem.page.title }} - {% trans "active page" %}"{% endif %}
href="{% page_absolute_url menuitem.page %}"><span>{{ menuitem.page.title }}</span></a>
{% if depth > 1 %}

3
tests/test_public.py
View File

@ -449,11 +449,12 @@ def test_repeated_slug(app):
def test_menu(app):
Page.objects.all().delete()
Page.objects.create(title='Page1', slug='index', template_name='standard', exclude_from_navigation=False)
page = Page.objects.create(title='Page1', slug='index', template_name='standard', exclude_from_navigation=False)
Page.objects.create(title='Page2', slug='page2', template_name='standard', exclude_from_navigation=False)
Page.objects.create(title='Page3', slug='page3', template_name='standard', public=False, exclude_from_navigation=False)
resp = app.get('/', status=200)
assert 'menu-index' in resp.text
assert 'data-menu-page-id="%s"' % page.id
assert 'menu-page2' in resp.text
assert 'menu-page3' in resp.text