From 081321b90b61b18315f5932e1b1a9487a6bb53df Mon Sep 17 00:00:00 2001 From: Jake <j.vondoemming@stud.uni-goettingen.de> Date: Thu, 4 Aug 2022 23:19:33 +0200 Subject: [PATCH] fixed rendering news and relevant_pages --- fgs/generator.py | 6 ++++-- theme/templates/macros/renderers.html | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fgs/generator.py b/fgs/generator.py index 5967df5..205ab12 100644 --- a/fgs/generator.py +++ b/fgs/generator.py @@ -71,9 +71,11 @@ class Generator: relevant_pages_tuple.append((page.relevance['prio'], page)) relevant_pages_tuple.sort(key=lambda x: x[0]) relevant_pages_tuple.reverse() - relevant_pages = [] + relevant_pages = {} for prio, page in relevant_pages_tuple: - relevant_pages.append(page) + if page.lang not in relevant_pages: + relevant_pages[page.lang] = [] + relevant_pages[page.lang].append(page) self.context['relevant_pages'] = relevant_pages self.context['relevant_pages_tuple'] = relevant_pages_tuple diff --git a/theme/templates/macros/renderers.html b/theme/templates/macros/renderers.html index a681666..ef35add 100644 --- a/theme/templates/macros/renderers.html +++ b/theme/templates/macros/renderers.html @@ -3,11 +3,11 @@ {%- import 'macros/content_renderer.html' as content_renderer with context -%} {%- macro section_news(s, lang) -%} - {{ cards.cards_from_pages(pages_modified, max=s.num|d(None)) }} + {{ cards.cards_from_pages(pages_modified[lang], max=s.num|d(None)) }} {%- endmacro -%} {%- macro section_relevant(s, lang) -%} - {{ cards.cards_from_pages(relevant_pages, max=s.num|d(None)) }} + {{ cards.cards_from_pages(relevant_pages[lang], max=s.num|d(None)) }} {%- endmacro -%} {%- macro section_custom(s, lang) -%} -- GitLab