Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nk20
Manage
Activity
Members
Labels
Plan
Issues
32
Issue boards
Milestones
Wiki
Code
Merge requests
6
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
BDE
nk20
Merge requests
!65
Resolve "Club Parent"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Club Parent"
parent-club
into
master
Overview
0
Commits
3
Pipelines
1
Changes
1
Merged
Benjamin Graillot
requested to merge
parent-club
into
master
5 years ago
Overview
0
Commits
3
Pipelines
1
Changes
1
Expand
Closes
#42 (closed)
Edited
5 years ago
by
Pierre-antoine Comby
👍
0
👎
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
59cd166b
3 commits,
5 years ago
1 file
+
14
−
0
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
apps/member/models.py
+
14
−
0
Options
@@ -4,6 +4,7 @@
import
datetime
from
django.conf
import
settings
from
django.core.exceptions
import
ValidationError
from
django.db
import
models
from
django.urls
import
reverse
,
reverse_lazy
from
django.utils.translation
import
gettext_lazy
as
_
@@ -67,6 +68,13 @@ class Club(models.Model):
email
=
models
.
EmailField
(
verbose_name
=
_
(
'
email
'
),
)
parent_club
=
models
.
ForeignKey
(
'
self
'
,
null
=
True
,
blank
=
True
,
on_delete
=
models
.
PROTECT
,
verbose_name
=
_
(
'
parent club
'
),
)
# Memberships
membership_fee
=
models
.
PositiveIntegerField
(
@@ -158,6 +166,12 @@ class Membership(models.Model):
else
:
return
self
.
date_start
.
toordinal
()
<=
datetime
.
datetime
.
now
().
toordinal
()
def
save
(
self
,
*
args
,
**
kwargs
):
if
self
.
club
.
parent_club
is
not
None
:
if
not
Membership
.
objects
.
filter
(
user
=
self
.
user
,
club
=
self
.
club
.
parent_club
):
raise
ValidationError
(
_
(
'
User is not a member of the parent club
'
))
super
().
save
(
*
args
,
**
kwargs
)
class
Meta
:
verbose_name
=
_
(
'
membership
'
)
verbose_name_plural
=
_
(
'
memberships
'
)
Loading