Add .distinct() to inactive ads to fix duplicate problem that was probably
introduced with pre-ADs - Legacy-Id: 3926
This commit is contained in:
parent
5382b31ab2
commit
1756491cf1
|
@ -301,9 +301,9 @@ if settings.USE_DB_REDESIGN_PROXY_CLASSES:
|
|||
active_ads = list(Person.objects.filter(role__name="ad",
|
||||
role__group__type="area",
|
||||
role__group__state="active").distinct())
|
||||
inactive_ads = list((Person.objects.filter(pk__in=responsible) | Person.objects.filter(role__name="pre-ad",
|
||||
inactive_ads = list(((Person.objects.filter(pk__in=responsible) | Person.objects.filter(role__name="pre-ad",
|
||||
role__group__type="area",
|
||||
role__group__state="active"))
|
||||
role__group__state="active")).distinct())
|
||||
.exclude(pk__in=[x.pk for x in active_ads]))
|
||||
extract_last_name = lambda x: x.name_parts()[3]
|
||||
active_ads.sort(key=extract_last_name)
|
||||
|
|
Loading…
Reference in a new issue