diff --git a/aleksis/apps/alsijil/filters.py b/aleksis/apps/alsijil/filters.py index 0149a337bcd74775f1ba01ffad2b3668f0b0f16a..c924aec0d78b5c28032407f805000d5481def23e 100644 --- a/aleksis/apps/alsijil/filters.py +++ b/aleksis/apps/alsijil/filters.py @@ -9,15 +9,18 @@ from .models import PersonalNote class PersonalNoteFilter(FilterSet): - day_start = DateFilter( - lookup_expr="gte", label=_("After"), initial=SchoolTerm.current.date_start - ) + day_start = DateFilter(lookup_expr="gte", label=_("After")) day_end = DateFilter(lookup_expr="lte", label=_("Before")) subject = CharFilter(lookup_expr="icontains", label=_("Subject")) def __init__(self, data=None, *args, **kwargs): if data is not None: data = data.copy() + + current_school_term = SchoolTerm.current + if not data.get("day_start") and current_school_term: + data["day_start"] = current_school_term.date_start + for name, f in self.base_filters.items(): initial = f.extra.get("initial") if not data.get(name) and initial: