From faf5bd184d2792a95ba8e8b199f9f51442149515 Mon Sep 17 00:00:00 2001 From: Darks Date: Tue, 26 Apr 2022 20:40:56 +0200 Subject: [PATCH] navbar: properly generate links to recent topics --- app/processors/menu.py | 15 ++++++++++++++- app/templates/base/navbar/forum.html | 8 +++----- app/templates/base/navbar/news.html | 8 +++----- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/processors/menu.py b/app/processors/menu.py index b45bbf6..a2879ff 100644 --- a/app/processors/menu.py +++ b/app/processors/menu.py @@ -32,5 +32,18 @@ def menu_processor(): last_active_topics = list(filter(f, last_active_topics))[:10] + # Constructing last news + raw = db.session.execute( """SELECT topic.id FROM topic + INNER JOIN forum ON topic.forum_id = forum.id + INNER JOIN comment ON topic.thread_id = comment.thread_id + INNER JOIN post ON post.id = comment.id + WHERE forum.url LIKE '/actus%' + GROUP BY topic.id + ORDER BY MIN(post.date_created) DESC + LIMIT 10; + """) + last_news = [Topic.query.get(id) for id in raw] + return dict(login_form=login_form, search_form=search_form, - main_forum=main_forum, last_active_topics=last_active_topics) + main_forum=main_forum, last_active_topics=last_active_topics, + last_news=last_news) diff --git a/app/templates/base/navbar/forum.html b/app/templates/base/navbar/forum.html index 29688c6..a38b67b 100644 --- a/app/templates/base/navbar/forum.html +++ b/app/templates/base/navbar/forum.html @@ -20,10 +20,8 @@

Derniers topics actifs

diff --git a/app/templates/base/navbar/news.html b/app/templates/base/navbar/news.html index 0bea391..844b7ed 100644 --- a/app/templates/base/navbar/news.html +++ b/app/templates/base/navbar/news.html @@ -18,10 +18,8 @@

Derniers articles