Skip to content
Snippets Groups Projects
Commit f96f5c2c authored by Nik | Klampfradler's avatar Nik | Klampfradler
Browse files

Merge branch 'fix/broken-filters' into 'master'

Use school term for filter only if existing

See merge request AlekSIS/official/AlekSIS-App-Alsijil!262
parents 22f54ea2 107538ef
No related branches found
No related tags found
1 merge request!262Use school term for filter only if existing
Pipeline #49859 passed
......@@ -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:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment