From 62f9f8ae176de99c8160cdaf8eaaf2c764cf73bc Mon Sep 17 00:00:00 2001
From: Dominik George <nik@naturalnet.de>
Date: Wed, 20 Nov 2019 15:44:37 +0100
Subject: [PATCH] Assign alias for personal_note count aggregate.
---
biscuit/apps/alsijil/views.py | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/biscuit/apps/alsijil/views.py b/biscuit/apps/alsijil/views.py
index 6aa1734f3..419bd6631 100644
--- a/biscuit/apps/alsijil/views.py
+++ b/biscuit/apps/alsijil/views.py
@@ -201,11 +201,10 @@ def full_register_group(request: HttpRequest, id_: int) -> HttpResponse:
personal_note_filters = PersonalNoteFilter.objects.all()
for personal_note_filter in personal_note_filters:
persons = persons.annotate(
- Count(
+ **{'personal_notes_with_%s' % personal_note_filter.identifier: Count(
'personal_notes__remarks',
- filter=Q(personal_notes__remarks__iregex=personal_note_filter.regex),
- output_field='personal_notes_with_%s' % personal_note_filter.identifier
- )
+ filter=Q(personal_notes__remarks__iregex=personal_note_filter.regex)
+ )}
)
context['persons'] = persons
--
GitLab