fix some merge errors

fet2020/fet2020/views.py

@@ -20,7 +20,7 @@ def index(request):
 
     context = {
         'posts': posts,
-        'events': Event.objects.get_all_events(),
+        'events': Event.objects.all(),
         'featured_post': featured_post,
         'featured_post2': FetMeeting.objects.first(),
         'tags_list': ", ".join(t)

fet2020/members/views.py

@@ -10,10 +10,6 @@ from rest_framework import permissions
 # from django_filters.rest_framework import DjangoFilterBackend
 
 
-<<<<<<< HEAD
-def show(request,nickname=None):
-    return render(request, 'members/index.html', context)
-
 
 def index(request, slug=None, filter=None):
     job_group = deque(JobGroup.objects.all())

fet2020/posts/templatetags/post_helpers.py

@@ -21,7 +21,7 @@ def create_a_link_for(v):
         m = None
 
     if not m is None:
-        return '<a href="' + str(reverse('member', kwargs= {"nickname": m.nickname})) + '">' + v + "</a>"    
+        return '<a href="' + str(reverse('member', kwargs= {"member_name": m.nickname})) + '">' + v + "</a>"    
     return "<a href=\"/posts/%s\">%s</a>" % (v,v)
 
 @register.filter(is_safe=True)

fet2020/posts/views.py

@@ -49,35 +49,13 @@ def show(request, id=None):
         "next": get_next_dict().get(p.slug, None),
         "related_posts": p.tags.similar_objects(),
         "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
+    return add_ep_cookie(request,response)
->>>>>>> 7fff88d1679058b52a4e2804534ea2dc76782873
+
 
 ###########
 # HELPERS #

fet2020/templates/posts/show.html

@@ -16,10 +16,8 @@
           <div class="article-details">
           {{post.subtitle | tags_to_url }}
           {% if post.username != None %}
-            <div class="arti
+            <div class="article-author">
-              <img src="{{post.username.image | thumbnail_url:'avatar'}}" alt="" />
+              <img src="{{post.author.image | thumbnail_url:'avatar'}}" alt="" />
-              <a href="{% url 'member' post.username.nickname %}">{{post.username.nickname}}</a>
-              <img src="{{author_image}}" alt="" />
               <a href="/members/member/{{post.author}}">{{post.author}}</a>
 
             </div>