Skip to content
Snippets Groups Projects

Make changes in GREG-28 work with the changes from GREG-26.

Merged Jonas Braathen requested to merge GREG-28-rebase into master
2 files
+ 7
7
Compare changes
  • Side-by-side
  • Inline
Files
2
+ 3
3
@@ -38,9 +38,9 @@ class PersonFilter(FilterSet):
@@ -38,9 +38,9 @@ class PersonFilter(FilterSet):
return queryset.annotate(
return queryset.annotate(
active=Case(
active=Case(
When(
When(
Q(person_roles__start_date__isnull=True)
Q(roles__start_date__isnull=True)
| Q(person_roles__start_date__lte=datetime_now),
| Q(roles__start_date__lte=datetime_now),
person_roles__end_date__gte=datetime_now,
roles__end_date__gte=datetime_now,
then=True,
then=True,
),
),
default=False,
default=False,
Loading