Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
296e90a7
Commit
296e90a7
authored
Sep 12, 2017
by
Tom van Bussel
Browse files
List each member only once in Registration admin
Previously `Member`s with multiple `Membership`s were listed
parent
94cbc4be
Changes
2
Hide whitespace changes
Inline
Side-by-side
website/events/admin.py
View file @
296e90a7
...
...
@@ -182,4 +182,6 @@ class RegistrationAdmin(DoNextModelAdmin):
if
request
.
GET
.
get
(
'event_pk'
):
kwargs
[
'queryset'
]
=
models
.
Event
.
objects
.
filter
(
pk
=
int
(
request
.
GET
[
'event_pk'
]))
elif
db_field
.
name
==
'member'
:
kwargs
[
'queryset'
]
=
Member
.
active_members
.
all
()
return
super
().
formfield_for_foreignkey
(
db_field
,
request
,
**
kwargs
)
website/members/models.py
View file @
296e90a7
...
...
@@ -24,7 +24,8 @@ class ActiveMemberManager(models.Manager):
return
(
super
().
get_queryset
()
.
exclude
(
user__membership
=
None
)
.
filter
(
Q
(
user__membership__until__isnull
=
True
)
|
Q
(
user__membership__until__gt
=
timezone
.
now
().
date
())))
Q
(
user__membership__until__gt
=
timezone
.
now
().
date
()))
.
distinct
())
def
with_birthdays_in_range
(
self
,
from_date
,
to_date
):
queryset
=
self
.
get_queryset
().
filter
(
birthday__lte
=
to_date
)
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment