Skip to content

Commit e8b4f9d

Browse files
committed
MainMenu should respect the template parameter (fixes iommirocks#708)
1 parent a8c63d9 commit e8b4f9d

File tree

2 files changed

+16
-3
lines changed

2 files changed

+16
-3
lines changed

iommi/main_menu.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,8 @@ def bind(self, request):
9797
style = resolve_style(None)
9898
conf = RefinableNamespace(*style.resolve(self))
9999

100-
template = conf.pop('template', 'iommi/main_menu/menu.html')
101100
if self.template is MISSING:
102-
template = template
101+
self.template = conf.pop('template', 'iommi/main_menu/menu.html')
103102

104103
assets = {
105104
k: v.bind(request=request)
@@ -115,7 +114,7 @@ def bind(self, request):
115114
self,
116115
request,
117116
attrs=attrs,
118-
template=template,
117+
template=self.template,
119118
assets=assets,
120119
)
121120

iommi/main_menu__tests.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -339,6 +339,20 @@ def decode_artist(string, **_):
339339
), "Not forbidden to access M with `params`, whose `include` uses them to deny access."
340340

341341

342+
def test_main_menu_template():
343+
# Regression test for https://github.com/iommirocks/iommi/issues/708
344+
menu = MainMenu(
345+
template=Template('<div>custom main menu template</div>'),
346+
items=dict(
347+
foo=M(
348+
view=fake_view,
349+
),
350+
),
351+
).bind(request=req('get'))
352+
353+
assert '<div>custom main menu template</div>' in str(menu)
354+
355+
342356
def test_m_template():
343357
menu = MainMenu(
344358
items=dict(

0 commit comments

Comments
 (0)