misc: change show_menu templatetag to ignore visibility by default (#29174)

This commit is contained in:
Frédéric Péters 2018-12-18 12:32:02 +01:00
parent 99347982d9
commit 7fab95e8cf
3 changed files with 5 additions and 3 deletions

View File

@ -786,7 +786,8 @@ class MenuCell(CellBase):
from combo.public.menu import render_menu
ctx = super(MenuCell, self).get_cell_extra_context(context)
ctx['menu'] = render_menu(context, level=self.initial_level,
root_page=self.root_page, depth=self.depth)
root_page=self.root_page, depth=self.depth,
ignore_visibility=False)
return ctx
def render_for_search(self):

View File

@ -24,7 +24,8 @@ def render_menu(context, level=0, root_page=None, depth=1, ignore_visibility=Fal
context['root_page'] = root_page
if root_page:
level = len(root_page.get_parents_and_self())
context = get_menu_context(context, level=level, current_page=None, depth=depth)
context = get_menu_context(context, level=level, current_page=None,
depth=depth, ignore_visibility=ignore_visibility)
template = get_template('combo/menu.html')
return template.render(context)

View File

@ -148,7 +148,7 @@ class ExtraPlaceholderNode(template.Node):
return skeleton_text(context, self.placeholder_name, content=self.content)
@register.inclusion_tag('combo/menu.html', takes_context=True)
def show_menu(context, level=0, current_page=None, depth=1, ignore_visibility=False, reduce_depth=False):
def show_menu(context, level=0, current_page=None, depth=1, ignore_visibility=True, reduce_depth=False):
if reduce_depth:
depth -= 1
new_context = {