ep verbesserung

fet2020/posts/views.py

@@ -11,7 +11,7 @@ from rest_framework import viewsets
 
 from .models import Post, PostSerializer
 # from documents import add_ep_to_response
-from documents import get_ep_sessionid, get_pad_link
+from documents import get_ep_sessionid2, get_pad_link,add_ep_cookie
 
 from collections import deque
 
@@ -48,34 +48,7 @@ def show(request, id=None):
         "ep_link": get_pad_link(p.slug + "-agenda")
     }
     response = render(request, 'posts/show.html', context)
-    response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at")
-<<<<<<< HEAD
-    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  )
-=======
-    ep_sessid, expires = get_ep_sessionid(request)
-    response.set_cookie(
-        "sessionID",
-        ep_sessid,
-        expires=expires,
-        domain=".2020.fet.at",
-        path="/etherpad"
-    )
-    '''
-    response.set_cookie(
-        "express_sid",
-        ep_sessid,
-        expires=expires,
-        domain="https://andis.2020.fet.at",
-        path="/etherpad"
-    )
-    '''
-    # response=add_ep_to_response(request, response  )
->>>>>>> a9b7ca5faead194ba253fadc59f6f1d83a8e5bc1
-
-    return response
+    return add_ep_cookie(request,response)
 
 ###########
 # HELPERS #