no functional changes:

update format

fet2020/members/admin.py

@@ -10,18 +10,15 @@ class ActiveJobFilter(admin.SimpleListFilter):
     parameter_name = 'is_active'
 
     def lookups(self, request, model_admin):
-
         return (
             ('yes', _('Yes')),
             ('no',  _('No')),
         )
 
     def queryset(self, request, queryset):
-
         if self.value() == 'yes':
             return queryset.filter(job_end__isnull=True)
-
+        elif self.value() == 'no':
-        if self.value() == 'no':
             return queryset
 
 class MemberRoleFilter(admin.SimpleListFilter):
@@ -30,18 +27,15 @@ class MemberRoleFilter(admin.SimpleListFilter):
     parameter_name = 'role'
 
     def lookups(self, request, model_admin):
-
         return (
             ('A', _('Aktiv')),
-            ('P',  _('Pension')),
+            ('P', _('Pension')),
         )
 
     def queryset(self, request, queryset):
-
         if self.value() == 'A':
             return queryset.filter(role='A')
-
+        elif self.value() == 'P':
-        if self.value() == 'P':
             return queryset.filter(role='P')
 
 class JobMemberInline(admin.TabularInline):
@@ -80,4 +74,4 @@ class MyJobAdmin(admin.ModelAdmin):
         obj.author = request.user
         super().save_model(request, obj, form, change)
 
-admin.site.register(Job, MyJobAdmin)
+admin.site.register(Job, MyJobAdmin)

fet2020/members/forms.py

@@ -7,8 +7,18 @@ from .models import Member, Job
 class MyMemberForm(forms.ModelForm):
     class Meta:
         model = Member
-        fields = ['firstname', 'surname', 'nickname','mailaccount', 'role',
+        fields = [
-        'description', 'image', 'birthday', 'phone', 'address']
+            'firstname',
+            'surname',
+            'nickname',
+            'mailaccount',
+            'role',
+            'description',
+            'image',
+            'birthday',
+            'phone',
+            'address'
+        ]
 
         widgets = {'description': CKEditorUploadingWidget(config_name='default')}
 
@@ -17,4 +27,4 @@ class MyJobForm(forms.ModelForm):
         model = Job
         fields = ['name', 'description', 'image']
 
-        widgets = {'description': CKEditorUploadingWidget(config_name='default')}
+        widgets = {'description': CKEditorUploadingWidget(config_name='default')}

fet2020/members/models.py

@@ -1,10 +1,11 @@
+from django.core.validators import RegexValidator
 from django.db import models
 from django.utils.translation import gettext_lazy as _
 from rest_framework import serializers
-from django.core.validators import RegexValidator
 
 import uuid
 
+
 class MemberManager(models.Manager):
     def get_queryset(self):
         return super().get_queryset().filter(role='A')
@@ -19,10 +20,11 @@ class Member(models.Model):
     nickname = models.CharField(max_length=128)
     mailaccount = models.CharField(max_length=128)
 
-    role = models.CharField(max_length=1, choices=
+    __choices = [
-        [('A', _('Active')),
+        ('A', _('Active')),
-         ('P', _('Pension'))],
+        ('P', _('Pension'))
-        default='A')
+    ]
+    role = models.CharField(max_length=1, choices= __choices, default='A')
 
     description = models.TextField(null=True, blank=True)
     image = models.ImageField(null=True, blank=True)
@@ -32,8 +34,7 @@ class Member(models.Model):
     phone_error_msg =_(("Phone number must be entered in the format: "
         "+999999999'. Up to 15 digits allowed."))
     phone_regex = RegexValidator(regex=r'^\+?1?\d{9,15}$', message=phone_error_msg)
-    phone = models.CharField(validators=[phone_regex],
+    phone = models.CharField(validators=[phone_regex], max_length=17, blank=True)
-        max_length=17, blank=True)
 
     address = models.TextField(null=True, blank=True)
 
@@ -57,8 +58,15 @@ class Member(models.Model):
 class MemberSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Member
-        fields = ['firstname', 'surname', 'nickname','mailaccount','role',
+        fields = [
-            'description', 'image']
+            'firstname',
+            'surname',
+            'nickname',
+            'mailaccount',
+            'role',
+            'description',
+            'image'
+        ]
 
 class Job(models.Model):
     name = models.CharField(max_length=128)
@@ -82,16 +90,17 @@ class JobMember(models.Model):
     job_start = models.DateField('Job Start')
     job_end = models.DateField('Job Ende', null=True, blank=True)
 
-    job_role = models.CharField(max_length=2,choices=
+    __choices = [
-        [('1V', _('VorsitzendeR')),
+        ('1V', _('VorsitzendeR')),
-         ('2V', _('stv VorsitzendeR')),
+        ('2V', _('stv VorsitzendeR')),
-         ('3V', _('2. stv VorsitzendeR')),
+        ('3V', _('2. stv VorsitzendeR')),
-         ('M', _('Mitglied')),
+        ('M', _('Mitglied')),
-         ('E', _('Ersatzmitglied')),
+        ('E', _('Ersatzmitglied')),
-         ('V', _('VerantwortlicheR'))],
+        ('V', _('VerantwortlicheR'))
-        default='M')
+    ]
+    job_role = models.CharField(max_length=2, choices=__choices, default='M')
 
     class Meta:
         unique_together = [['member', 'job']]
 
-    jobmember = models.Manager()
+    jobmember = models.Manager()

fet2020/members/urls.py

@@ -5,4 +5,4 @@ from . import views
 
 urlpatterns = [
     path('', views.index, name='members.index'),
-]
+]

fet2020/members/views.py

@@ -33,5 +33,6 @@ class MemberViewSet(viewsets.ModelViewSet):
     #filter_backends = [DjangoFilterBackend]
     #filterset_fields = ['legacy_id', 'slug','legacy_rubrik_id']
     lookup_field='name'
+
     def pre_save(self, obj):
-        obj.image = self.request.FILES.get('image')
+        obj.image = self.request.FILES.get('image')