change image of member from ImageField to ThumbnailerImageField

This commit is contained in:
2020-08-27 22:43:04 +00:00
parent 37dff3b310
commit 764bee63f6
6 changed files with 11 additions and 16 deletions

View File

@@ -1,7 +1,7 @@
# from django.contrib.auth.models import User # from django.contrib.auth.models import User
from django.contrib.auth.middleware import RemoteUserMiddleware from django.contrib.auth.middleware import RemoteUserMiddleware
# import django # import django
import logging # import logging
# logger=logging.getLogger("django.request") # logger=logging.getLogger("django.request")
@@ -13,7 +13,7 @@ class FETHeaderMiddleware(RemoteUserMiddleware):
self.header, self.header,
request.headers.get(self.header, None) request.headers.get(self.header, None)
) )
logger = logging.getLogger(__name__) # logger = logging.getLogger(__name__)
super().process_request(request) super().process_request(request)
# logger.info('User: ' + str(request.user)) # logger.info('User: ' + str(request.user))
if request.user.is_authenticated: if request.user.is_authenticated:

View File

@@ -6,6 +6,7 @@ from django.utils.text import slugify
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from datetime import timedelta from datetime import timedelta
from easy_thumbnails.fields import ThumbnailerImageField
from rest_framework import serializers 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) role = models.CharField(max_length=1, choices=MemberRole.choices, default=MemberRole.ACTIVE)
description = models.TextField(null=True, blank=True) description = models.TextField(null=True, blank=True)
image = models.ImageField(null=True, blank=True) image = ThumbnailerImageField()
birthday = models.DateField(null=True, blank=True) birthday = models.DateField(null=True, blank=True)

View File

@@ -10,6 +10,7 @@ from rest_framework import viewsets
# from rest_framework import permissions # from rest_framework import permissions
from .models import Post, PostSerializer from .models import Post, PostSerializer
from members.models import Member
# from documents import add_ep_to_response # from documents import add_ep_to_response
from documents import get_ep_sessionid, get_pad_link 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: elif id != "" and id is not None:
p = Post.objects.get(slug=(id)) 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 = Member.all_members.filter(nickname=p.author)
post_author_thumb_url = get_thumbnailer(post_author[0].image)['thumb'].url
context = { context = {
"post": p, "post": p,
"next": get_next_dict().get(p.slug, None), "next": get_next_dict().get(p.slug, None),
"related_posts": p.tags.similar_objects(), "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_thumb_url "author_image": post_author[0].image['avatar'].url
} }
response = render(request, 'posts/show.html', context) response = render(request, 'posts/show.html', context)
response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at") response.set_cookie("HelloWorld", "TestWert", domain="https://etherpad2.2020.fet.at")
ep_sessid, expires = get_ep_sessionid(request) ep_sessid, expires = get_ep_sessionid(request)

View File

@@ -1,4 +1,4 @@
func{% extends 'layout.html' %} {% extends 'layout.html' %}
{% load post_helpers %} {% load post_helpers %}
{% load static %} {% load static %}
{% block content %} {% block content %}

View File

@@ -3,8 +3,6 @@
{# only thumb and name of member #} {# only thumb and name of member #}
{% load thumbnail %} {% load thumbnail %}
<a class="thumbnail member-thumb" href="/members/member/{{member.nickname}}" style="width:150px;height:150px"> <a class="thumbnail member-thumb" href="/members/member/{{member.nickname}}" style="width:150px;height:150px">
{% if member.image %} <img src="{{member.image.thumb.url}}" alt="" />
<img src="{{member.image | thumbnail_url:'thumb'}}" />
{% endif %}
<div class="thumb-layer"><div><h1>{{member.nickname}}</h1> <p>{{member.firstname}} {{member.surname}}</p></div></div> <div class="thumb-layer"><div><h1>{{member.nickname}}</h1> <p>{{member.firstname}} {{member.surname}}</p></div></div>
</a> </a>

View File

@@ -16,7 +16,7 @@
<div class="article-details"> <div class="article-details">
{{post.subtitle | tags_to_url }} {{post.subtitle | tags_to_url }}
<div class="article-author"> <div class="article-author">
<img src="{{author_image}}" alt="" style="width:80px;height:80px"/> <img src="{{author_image}}" alt="" />
<a href="/members/member/{{post.author}}">{{post.author}}</a> <a href="/members/member/{{post.author}}">{{post.author}}</a>
</div> </div>