no functional changes

Formatting updated to pep8
This commit is contained in:
2020-07-19 14:31:03 +00:00
parent f2f288a447
commit 263c2a6e05
10 changed files with 98 additions and 86 deletions

View File

@@ -1,13 +1,13 @@
from django.shortcuts import render
from django.http import HttpResponse, JsonResponse
from django.http import HttpResponse, JsonResponse, HttpResponseServerError
from django_filters.rest_framework import DjangoFilterBackend
from django.core.cache import cache
# from django.core.cache import cache
from django.utils.text import slugify
from django.utils import timezone
from taggit.models import Tag
from rest_framework import viewsets
from rest_framework import permissions
# from rest_framework import permissions
from .models import Post, PostSerializer
@@ -20,26 +20,28 @@ from collections import deque
def index(request):
posts = deque(Post.objects.order_by('-public_date').all())
f = lambda p: p.tags
def f(p):
return p.tags
t = map(f, posts)
return render(request, 'posts/index.html', {"posts": posts, "tags_list": t})
def tags(request,tag=""):
def tags(request, tag=""):
posts = deque(Post.objects.filter(tags__name=tag))
return render(request, 'posts/index.html', {"posts": posts, "tags_list": None})
def show(request,id=None):
def show(request, id=None):
if id.isdigit() or id is int:
p = Post.objects.get(id=int(id))
elif id != "" and not id is None:
elif id != "" and id is not None:
p = Post.objects.get(slug=(id))
context = {
"post": p,
"next": get_next_dict().get(p.slug,None),
"next": get_next_dict().get(p.slug, None),
"related_posts": p.tags.similar_objects()
}
return render(request, 'posts/show.html', context)
@@ -77,7 +79,7 @@ def tag_complete(request):
tag_objects = Tag.objects.filter(name__istartswith=term)
tag_array =[]
tag_array = []
for elem in tag_objects:
tag_array.append(elem.name)
@@ -87,15 +89,15 @@ def tag_complete(request):
def get_next_dict():
#TODO: Docstring
# TODO: Docstring
posts = Post.article_objects.order_by('-public_date').values('slug')
print(posts)
d = {}
print(d)
for k,v in enumerate(posts):
for k, v in enumerate(posts):
if k == len(posts) - 1:
break
d[v['slug']] = posts[k+1]['slug']
d[v['slug']] = posts[k + 1]['slug']
print(d)
return d
@@ -106,9 +108,9 @@ class PostViewSet(viewsets.ModelViewSet):
"""
queryset = Post.objects.all().order_by('-public_date')
serializer_class = PostSerializer
#permission_classes = [permissions.IsAuthenticated]
# permission_classes = [permissions.IsAuthenticated]
filter_backends = [DjangoFilterBackend]
filterset_fields = ['legacy_id', 'slug','legacy_rubrik_id']
filterset_fields = ['legacy_id', 'slug', 'legacy_rubrik_id']
lookup_field = 'slug'
def pre_save(self, obj):