diff --git a/fet2020/members/admin.py b/fet2020/members/admin.py index 4da4b3f5..3728b08a 100644 --- a/fet2020/members/admin.py +++ b/fet2020/members/admin.py @@ -78,7 +78,6 @@ class MemberAdmin(admin.ModelAdmin): "surname", ), "nickname", - "username", "mailaccount", "role", "description", diff --git a/fet2020/members/models.py b/fet2020/members/models.py index cb864ede..35f686c9 100644 --- a/fet2020/members/models.py +++ b/fet2020/members/models.py @@ -1,5 +1,6 @@ import logging +from django.conf import settings from django.contrib.auth.models import User from django.core.validators import ValidationError, validate_email from django.db import models @@ -31,7 +32,7 @@ class Member(models.Model): nickname = models.CharField("Spitzname", max_length=128) # LDAP Username - username = models.CharField("fet.at Benutzername", max_length=128, blank=True) + username = models.CharField(max_length=128) # fet mail account mailaccount = models.CharField( @@ -106,6 +107,38 @@ class Member(models.Model): def get_model_name(self): return self._meta.model_name + @property + def image_url(self): + if self.image: + return self.image.url + + # return default image + return settings.STATIC_URL + "img/FET-Logo-2014-quadrat.png" + + @property + def avatar_url(self): + if self.image: + return self.image["avatar"].url + + # return default image + return settings.STATIC_URL + "img/FET-Logo-2014-quadrat.png" + + @property + def portrait_url(self): + if self.image: + return self.image["portrait"].url + + # return default image + return settings.STATIC_URL + "img/FET-Logo-2014-quadrat.png" + + @property + def thumb_url(self): + if self.image: + return self.image["thumb"].url + + # return default image + return settings.STATIC_URL + "img/FET-Logo-2014-quadrat.png" + class JobGroup(models.Model): name = models.CharField(max_length=128) diff --git a/fet2020/posts/views.py b/fet2020/posts/views.py index b71b6386..3efc018a 100644 --- a/fet2020/posts/views.py +++ b/fet2020/posts/views.py @@ -125,7 +125,7 @@ class PostDetailView(DetailView): post_author = Member.all_members.filter(username=self.object.author).first() if post_author: author = post_author - author_image = post_author.image["avatar"].url + author_image = post_author.avatar_url related_posts = self.object.tags.similar_objects() # list of non 'is_hidden' posts for related_posts diff --git a/fet2020/templates/members/jobs.html b/fet2020/templates/members/jobs.html index a03ccdd5..9a6ad52c 100644 --- a/fet2020/templates/members/jobs.html +++ b/fet2020/templates/members/jobs.html @@ -23,7 +23,7 @@ {% for jm in jobmem.list %}
- Portraitfoto von {{ jm.member.firstname }} + Portraitfoto von {{ jm.member.firstname }}

{{ jm.member.firstname }} {{ jm.member.surname }}

{{ jm.get_job_role_display }}

diff --git a/fet2020/templates/members/member.html b/fet2020/templates/members/member.html index f802b2fe..c11f6495 100644 --- a/fet2020/templates/members/member.html +++ b/fet2020/templates/members/member.html @@ -5,7 +5,7 @@ {% block title %}{{ member.firstname }} {{ member.surname }}{% endblock %} {% block extraheader %} - + @@ -15,16 +15,18 @@
- Portraitfoto von {{ member.firstname }} {{ member.surname }} + Portraitfoto von {{ member.firstname }} {{ member.surname }}

{{ member.firstname }} {{ member.surname }}

Spitzname: {{ member.nickname }}
Mailaccount: {{ member.mailaccount }}
-
- {{ member.description|softhyphen|safe }} -
+ {% if member.description %} +
+ {{ member.description|softhyphen|safe }} +
+ {% endif %}
{% if active_jobs or inactive_jobs %}