From 34abb3acf39ba6f3b1b09ef7893cb0067ca11439 Mon Sep 17 00:00:00 2001 From: root Date: Sun, 6 Mar 2022 12:38:50 +0000 Subject: [PATCH] fix merge with master --- fet2020/posts/views.py | 14 ++++++-------- fet2020/templates/base.html | 14 ++++++++------ fet2020/templates/home.html | 4 +++- fet2020/templates/layout.html | 4 ++-- 4 files changed, 19 insertions(+), 17 deletions(-) diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py index 6be98a3e..9bdf536d 100644 --- a/fet2020/posts/views.py +++ b/fet2020/posts/views.py @@ -202,7 +202,7 @@ def show(request, id=None): "author": author, "author_image": author_image, "next": __next(post, public_only), - "previous": get_previous_dict(p), + "previous": __previous(post, public_only), "related_posts": related_posts[0:6], "ep_agenda_link": ep_agenda_link, "ep_protocol_link": ep_protocol_link, @@ -285,17 +285,15 @@ def __next(post=None, public=True): return d -def get_previous_dict(post=None): - # TODO: Docstring +def __previous(post=None, public=True): + """ + Helper function for getting previous post + """ posts = None d = post.slug if post: - # TODO: bad implementation but it works!! - if post.post_type == "N" or post.post_type == "E": - posts = Post.articles.get_visible_articles() - elif post.post_type == "F": - posts = FetMeeting.objects.get_queryset().order_by("-event_start") + posts = Post.objects.date_sorted_list(public).filter(post_type=post.post_type) if posts: for k, v in enumerate(posts): diff --git a/fet2020/templates/base.html b/fet2020/templates/base.html index ee6ad44f..1a387e7b 100644 --- a/fet2020/templates/base.html +++ b/fet2020/templates/base.html @@ -40,6 +40,8 @@ + {% block galleryheader %} + {% endblock %} {% block extraheader %} {% endblock %} @@ -67,8 +69,8 @@ x-transition:leave-end="transform opacity-0 scale-90" >
  • News
    • -
  • Fachschaft
    • -
  • Fotos
    • +
  • Fachschaft
    • +
  • Galerie
  • Blackboard
  • Kontakt
    • @@ -120,16 +122,16 @@