From 471321860710b44cba9be4a153f0430d63ff493a Mon Sep 17 00:00:00 2001
From: Dominik George <nik@naturalnet.de>
Date: Fri, 23 Aug 2019 09:58:39 +0200
Subject: [PATCH] Try to use an extra field for person name.
---
biscuit/apps/alsijil/forms.py | 9 ++++-----
biscuit/apps/alsijil/templates/alsijil/lesson.html | 2 +-
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/biscuit/apps/alsijil/forms.py b/biscuit/apps/alsijil/forms.py
index bdfa7e7e4..4520218f8 100644
--- a/biscuit/apps/alsijil/forms.py
+++ b/biscuit/apps/alsijil/forms.py
@@ -13,14 +13,13 @@ class LessonDocumentationForm(forms.ModelForm):
class PersonalNoteForm(forms.ModelForm):
class Meta:
model = PersonalNote
- fields = ['person', 'absent', 'late', 'excused', 'remarks']
+ fields = ['absent', 'late', 'excused', 'remarks']
+
+ person_name = forms.CharField(disabled=True)
def __init__(self, *args, **kwargs):
+ kwargs.update(initial={'person_name': str(kwargs['instance'].person)})
super().__init__(*args, **kwargs)
- self.fields['person'].widget.attrs['readonly'] = True
-
- 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 84ab4db61..9585d7671 100644
--- a/biscuit/apps/alsijil/templates/alsijil/lesson.html
+++ b/biscuit/apps/alsijil/templates/alsijil/lesson.html
@@ -53,7 +53,7 @@
</tr>
{% for form in personal_note_formset %}
<tr>
- <td>{{ form.person }}</td>
+ <td>{{ form.person_name }}</td>
<td>{{ form.absent }}</td>
<td>{{ form.late }}</td>
<td>{{ form.excused }}</td>
--
GitLab