From 675738038018869534cdfdfa9a98f7eff97d4a53 Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Tue, 13 Nov 2018 00:18:06 +0000 Subject: [PATCH] wiki: Make navbar independent from page This allows to show navigation on pages that don't exist, yet Signed-off-by: Michael Tremer --- src/templates/wiki/base.html | 2 +- src/web/wiki.py | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/templates/wiki/base.html b/src/templates/wiki/base.html index de491fb5..19516de8 100644 --- a/src/templates/wiki/base.html +++ b/src/templates/wiki/base.html @@ -7,7 +7,7 @@
- {% module WikiNavbar(page) %} + {% module WikiNavbar() %} {% block main %}{% end block %}
diff --git a/src/web/wiki.py b/src/web/wiki.py index a3d4e65b..90da993c 100644 --- a/src/web/wiki.py +++ b/src/web/wiki.py @@ -101,8 +101,10 @@ class WikiListModule(ui_modules.UIModule): class WikiNavbarModule(ui_modules.UIModule): - def render(self, page, suffix=None): - breadcrumbs = self.backend.wiki.make_breadcrumbs(page.url) + def render(self, suffix=None): + breadcrumbs = self.backend.wiki.make_breadcrumbs(self.request.path) + + title = self.backend.wiki.get_page_title(self.request.path) return self.render_string("wiki/modules/navbar.html", - breadcrumbs=breadcrumbs, page_title=page.title, suffix=suffix) + breadcrumbs=breadcrumbs, page_title=title, suffix=suffix) -- 2.39.2