bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix: hidden posts work now

Browse Source
This commit is contained in:
Patrick Mayr
2020-09-05 18:45:27 +00:00
parent b21402f7ae
commit 91c127b0db
1 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
fet2020/posts/views.py
View File

@@ -9,7 +9,7 @@ from taggit.models import Tag
from rest_framework import viewsets from rest_framework import viewsets
# from rest_framework import permissions # from rest_framework import permissions
from .models import Post, PostSerializer from .models import Post, PostSerializer, FetMeeting
from members.models import Member from members.models import Member
# from documents import add_ep_to_response, get_ep_sessionid2 # from documents import add_ep_to_response, get_ep_sessionid2
from documents import get_pad_link from documents import get_pad_link
@@ -47,9 +47,9 @@ def tags(request, tag=""):
def show(request, id=None): def show(request, id=None):
if id.isdigit() or id is int: 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: 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() post_author = Member.all_members.filter(nickname=p.author).first()
author_image = None author_image = None
@@ -114,21 +114,24 @@ def tag_complete(request):
def get_next_dict(post=None): def get_next_dict(post=None):
# TODO: Docstring # TODO: Docstring
# TODO: bad implementation but it works!! posts = None
if post.post_type == 'N' or post.post_type == 'E': d = post.slug
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')
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 posts:
if post.slug == v.slug: for k, v in enumerate(posts):
if (k + 1) < len(posts): if post.slug == v.slug:
d = posts[k + 1].slug if (k + 1) < len(posts):
else: d = posts[k + 1].slug
d = posts[0].slug else:
break d = posts[0].slug
break
return d return d