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

Merge branch 'master' of https://git.fet.at/bofh/fet2020

Browse Source
This commit is contained in:
Andreas Stephanides
2020-09-02 17:31:32 +00:00
parent 8d93b8c113 a8cd21b930
commit dc1e402e4d
8 changed files with 35 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
fet2020/posts/views.py
View File

@@ -10,9 +10,10 @@ from rest_framework import viewsets
# from rest_framework import permissions
from .models import Post, PostSerializer
from members.models import Member
# from documents import add_ep_to_response
from documents import get_ep_sessionid2, get_pad_link,add_ep_cookie
# from members.models import Member
# from documents import add_ep_to_response, get_ep_sessionid2
from documents import get_pad_link
from documents.etherpadlib import add_ep_cookie
from collections import deque
@@ -47,7 +48,7 @@ def show(request, id=None):
elif id != "" and id is not None:
p = Post.objects.get(slug=(id))
post_author = Member.all_members.filter(nickname=p.author)
# post_author = Member.all_members.filter(nickname=p.author)
context = {
"post": p,
@@ -59,7 +60,7 @@ def show(request, id=None):
response = render(request, 'posts/show.html', context)
return add_ep_cookie(request,response)
return add_ep_cookie(request, response)
###########