From 91c127b0dbb45340daaea551c4377d13d7d5cc9f Mon Sep 17 00:00:00 2001 From: Patrick Date: Sat, 5 Sep 2020 18:45:27 +0000 Subject: [PATCH] fix: hidden posts work now --- fet2020/posts/views.py | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py index 2e8b4e52..40eb18f4 100644 --- a/fet2020/posts/views.py +++ b/fet2020/posts/views.py @@ -9,7 +9,7 @@ from taggit.models import Tag from rest_framework import viewsets # from rest_framework import permissions -from .models import Post, PostSerializer +from .models import Post, PostSerializer, FetMeeting from members.models import Member # from documents import add_ep_to_response, get_ep_sessionid2 from documents import get_pad_link @@ -47,9 +47,9 @@ def tags(request, tag=""): def show(request, id=None): if id.isdigit() or id is int: - p = Post.objects.get_visible_articles().get(id=int(id)) + p = Post.objects.get(id=int(id)) elif id != "" and id is not None: - p = Post.objects.get_visible_articles().get(slug=(id)) + p = Post.objects.get(slug=(id)) post_author = Member.all_members.filter(nickname=p.author).first() author_image = None @@ -114,21 +114,24 @@ def tag_complete(request): def get_next_dict(post=None): # TODO: Docstring - # 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 = Post.objects.get_visible_articles().filter(post_type='F').order_by('-event_start') + posts = None + d = post.slug - d = "" + 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') - for k, v in enumerate(posts): - if post.slug == v.slug: - if (k + 1) < len(posts): - d = posts[k + 1].slug - else: - d = posts[0].slug - break + if posts: + for k, v in enumerate(posts): + if post.slug == v.slug: + if (k + 1) < len(posts): + d = posts[k + 1].slug + else: + d = posts[0].slug + break return d