merged

fet2020/posts/views.py

@@ -10,6 +10,7 @@ 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
 
@@ -41,14 +42,42 @@ 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)
+
     context = {
         "post": p,
         "next": get_next_dict().get(p.slug, None),
         "related_posts": p.tags.similar_objects(),
-        "ep_link": get_pad_link(p.slug + "-agenda")
+        "ep_link": get_pad_link(p.slug + "-agenda"),
+        "author_image": post_author[0].image['avatar'].url
     }
+
     response = render(request, 'posts/show.html', context)
+<<<<<<< HEAD
     return add_ep_cookie(request,response)
+=======
+    response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at")
+    ep_sessid, expires = get_ep_sessionid(request)
+    response.set_cookie(
+        "sessionID",
+        ep_sessid,
+        expires=expires,
+        domain=".2020.fet.at",
+        path="/"
+    )
+    '''
+    response.set_cookie(
+        "express_sid",
+        ep_sessid,
+        expires=expires,
+        domain="https://andis.2020.fet.at",
+        path="/etherpad"
+    )
+    '''
+    # response=add_ep_to_response(request, response  )
+
+    return response
+>>>>>>> 7fff88d1679058b52a4e2804534ea2dc76782873
 
 ###########
 # HELPERS #