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

fix merge conflict

Browse Source
This commit is contained in:
Patrick Mayr
2020-08-27 15:54:21 +00:00
parent 488ef97ba6
commit c9491f4d43
3 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
fet2020/posts/views.py
View File

@@ -49,19 +49,13 @@ def show(request, id=None):
}
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"
path="/"
)
'''
response.set_cookie(
@@ -73,7 +67,6 @@ def show(request, id=None):
)
'''
# response=add_ep_to_response(request, response )
>>>>>>> a9b7ca5faead194ba253fadc59f6f1d83a8e5bc1
return response