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
e7460386
Unverified
Commit
e7460386
authored
Nov 22, 2017
by
Joost Rijneveld
Browse files
committees: combine adjacent memberships
parent
4140eac1
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/activemembers/models.py
View file @
e7460386
...
...
@@ -249,9 +249,11 @@ class CommitteeMembership(models.Model, metaclass=ModelTranslateMeta):
@
property
def
initial_connected_membership
(
self
):
""" Find the oldest membership directly connected to the current one"""
qs
=
CommitteeMembership
.
objects
.
filter
(
committee
=
self
.
committee
,
member
=
self
.
member
,
until
=
self
.
since
)
qs
=
CommitteeMembership
.
objects
.
filter
(
committee
=
self
.
committee
,
member
=
self
.
member
,
until__lte
=
self
.
since
,
until__gte
=
self
.
since
-
datetime
.
timedelta
(
days
=
1
))
if
qs
.
count
()
>=
1
:
# should actually only be one; should be unique
return
qs
.
first
().
initial_connected_membership
else
:
...
...
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