diff --git a/fet2020/fet2020/middleware.py b/fet2020/fet2020/middleware.py
index dcffa50a..4a638721 100644
--- a/fet2020/fet2020/middleware.py
+++ b/fet2020/fet2020/middleware.py
@@ -1,7 +1,7 @@
# from django.contrib.auth.models import User
from django.contrib.auth.middleware import RemoteUserMiddleware
# import django
-import logging
+# import logging
# logger=logging.getLogger("django.request")
@@ -13,9 +13,9 @@ class FETHeaderMiddleware(RemoteUserMiddleware):
self.header,
request.headers.get(self.header, None)
)
- logger = logging.getLogger(__name__)
+ # logger = logging.getLogger(__name__)
super().process_request(request)
- #logger.info('User: ' + str(request.user))
+ # logger.info('User: ' + str(request.user))
if request.user.is_authenticated:
request.user.is_admin = True
request.user.is_superuser = True
diff --git a/fet2020/members/models.py b/fet2020/members/models.py
index 5ba8ea43..1f7f7118 100644
--- a/fet2020/members/models.py
+++ b/fet2020/members/models.py
@@ -6,6 +6,7 @@ from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _
from datetime import timedelta
+from easy_thumbnails.fields import ThumbnailerImageField
from rest_framework import serializers
@@ -91,7 +92,7 @@ class Member(models.Model):
role = models.CharField(max_length=1, choices=MemberRole.choices, default=MemberRole.ACTIVE)
description = models.TextField(null=True, blank=True)
- image = models.ImageField(null=True, blank=True)
+ image = ThumbnailerImageField()
birthday = models.DateField(null=True, blank=True)
diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py
index bcb70255..7428e581 100644
--- a/fet2020/posts/views.py
+++ b/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_sessionid, get_pad_link
@@ -41,21 +42,16 @@ def show(request, id=None):
elif id != "" and id is not None:
p = Post.objects.get(slug=(id))
- from members.models import Member
- from easy_thumbnails.files import get_thumbnailer
-
-
- #post_author = p.author
post_author = Member.all_members.filter(nickname=p.author)
- post_author_thumb_url = get_thumbnailer(post_author[0].image)['thumb'].url
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"),
- "author_image": post_author_thumb_url
+ "author_image": post_author[0].image['avatar'].url
}
+
response = render(request, 'posts/show.html', context)
response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at")
ep_sessid, expires = get_ep_sessionid(request)
diff --git a/fet2020/templates/home.html b/fet2020/templates/home.html
index 062fa43b..2c1333b4 100644
--- a/fet2020/templates/home.html
+++ b/fet2020/templates/home.html
@@ -1,4 +1,4 @@
-func{% extends 'layout.html' %}
+{% extends 'layout.html' %}
{% load post_helpers %}
{% load static %}
{% block content %}
diff --git a/fet2020/templates/members/partials/_member.html b/fet2020/templates/members/partials/_member.html
index 5c70a9a6..b2ae4f58 100644
--- a/fet2020/templates/members/partials/_member.html
+++ b/fet2020/templates/members/partials/_member.html
@@ -3,8 +3,6 @@
{# only thumb and name of member #}
{% load thumbnail %}
-{% if member.image %}
- {{member.firstname}} {{member.surname}}
-{% endif %}
+
{{member.nickname}}