diff --git a/.dockerignore b/.dockerignore index efc2616a..c238afc6 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,3 +1,5 @@ __pycache__ media db.sqlite3 +.tox +.coverage \ No newline at end of file diff --git a/apps/member/tables.py b/apps/member/tables.py index 3e4261ef..8c979f08 100644 --- a/apps/member/tables.py +++ b/apps/member/tables.py @@ -165,5 +165,5 @@ class ClubManagerTable(tables.Table): 'style': 'table-layout: fixed;' } template_name = 'django_tables2/bootstrap4.html' - fields = ('user', 'user.first_name', 'user.last_name', 'roles', ) + fields = ('user', 'user__first_name', 'user__last_name', 'roles', ) model = Membership diff --git a/apps/note/forms.py b/apps/note/forms.py index 3482d902..e4e976e1 100644 --- a/apps/note/forms.py +++ b/apps/note/forms.py @@ -5,7 +5,7 @@ from datetime import datetime from django import forms from django.contrib.contenttypes.models import ContentType from django.forms import CheckboxSelectMultiple -from django.utils.timezone import make_aware +from django.utils.timezone import make_aware from django.utils.translation import gettext_lazy as _ from note_kfet.inputs import Autocomplete, AmountInput, DateTimePickerInput diff --git a/apps/permission/tables.py b/apps/permission/tables.py index a2f6db78..42d62fb6 100644 --- a/apps/permission/tables.py +++ b/apps/permission/tables.py @@ -53,7 +53,7 @@ class RightsTable(tables.Table): 'style': 'table-layout: fixed;' } template_name = 'django_tables2/bootstrap4.html' - fields = ('user__last_name', 'user.first_name', 'user', 'club', 'roles', ) + fields = ('user__last_name', 'user__first_name', 'user', 'club', 'roles', ) model = Membership