From 20f3ba5e1326dd9ac50abdcbdac7e8d866b5ad06 Mon Sep 17 00:00:00 2001
From: Dominik George <nik@naturalnet.de>
Date: Fri, 23 Aug 2019 09:54:21 +0200
Subject: [PATCH] Revert "Try getting to full names of persons."
This reverts commit 12468ed9e0cb84b98ce0325bffaefadcca930a56.
---
biscuit/apps/alsijil/forms.py | 11 ++++-------
biscuit/apps/alsijil/templates/alsijil/lesson.html | 6 ++----
2 files changed, 6 insertions(+), 11 deletions(-)
diff --git a/biscuit/apps/alsijil/forms.py b/biscuit/apps/alsijil/forms.py
index 200034c50..bdfa7e7e4 100644
--- a/biscuit/apps/alsijil/forms.py
+++ b/biscuit/apps/alsijil/forms.py
@@ -13,17 +13,14 @@ class LessonDocumentationForm(forms.ModelForm):
class PersonalNoteForm(forms.ModelForm):
class Meta:
model = PersonalNote
- fields = ['person__last_name', 'person__first_name', 'absent', 'late', 'excused', 'remarks']
+ fields = ['person', 'absent', 'late', 'excused', 'remarks']
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
- self.fields['person__last_name'].widget.attrs['readonly'] = True
- self.fields['person__first_name'].widget.attrs['readonly'] = True
+ self.fields['person'].widget.attrs['readonly'] = True
- def clean_person__last_name(self):
- return self.instance.person__last_name
- def clean_person__first_name(self):
- return self.instance.person__first_name
+ def clean_person(self):
+ return self.instance.person
PersonalNoteFormSet = forms.modelformset_factory(
diff --git a/biscuit/apps/alsijil/templates/alsijil/lesson.html b/biscuit/apps/alsijil/templates/alsijil/lesson.html
index c18a799d8..84ab4db61 100644
--- a/biscuit/apps/alsijil/templates/alsijil/lesson.html
+++ b/biscuit/apps/alsijil/templates/alsijil/lesson.html
@@ -45,8 +45,7 @@
<table class="table table-striped table-bordered table-hover table-condensed table-responsive w-100 d-block d-md-table">
<tr>
- <th>{% blocktrans %}Last name{% endblocktrans %}</th>
- <th>{% blocktrans %}First name{% endblocktrans %}</th>
+ <th>{% blocktrans %}Person{% endblocktrans %}</th>
<th>{% blocktrans %}Absent{% endblocktrans %}</th>
<th>{% blocktrans %}Tardiness{% endblocktrans %}</th>
<th>{% blocktrans %}Excused{% endblocktrans %}</th>
@@ -54,8 +53,7 @@
</tr>
{% for form in personal_note_formset %}
<tr>
- <td>{{ form.person__last_name }}</td>
- <td>{{ form.person__firstname }}</td>
+ <td>{{ form.person }}</td>
<td>{{ form.absent }}</td>
<td>{{ form.late }}</td>
<td>{{ form.excused }}</td>
--
GitLab