Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
nk20
Manage
Activity
Members
Labels
Plan
Issues
31
Issue boards
Milestones
Wiki
Code
Merge requests
5
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
Commits
92ab5ee3
Commit
92ab5ee3
authored
4 years ago
by
ynerant
Browse files
Options
Downloads
Patches
Plain Diff
Fix memberships with clubs without memberships (we always need treasurers...)
parent
535c493b
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!71
Memberships
Pipeline
#8080
passed with stages
in 3 minutes and 29 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
apps/member/models.py
+4
-1
4 additions, 1 deletion
apps/member/models.py
apps/member/views.py
+4
-4
4 additions, 4 deletions
apps/member/views.py
with
8 additions
and
5 deletions
apps/member/models.py
+
4
−
1
View file @
92ab5ee3
...
...
@@ -128,6 +128,9 @@ class Club(models.Model):
This function is called each time the club detail view is displayed.
Update the year of the membership dates.
"""
if
not
self
.
membership_start
:
return
today
=
datetime
.
date
.
today
()
if
(
today
-
self
.
membership_start
).
days
>=
365
:
...
...
@@ -237,7 +240,7 @@ class Membership(models.Model):
if
self
.
club
.
membership_duration
is
not
None
:
self
.
date_end
=
self
.
date_start
+
datetime
.
timedelta
(
days
=
self
.
club
.
membership_duration
)
else
:
self
.
date_end
=
self
.
date_start
+
datetime
.
timedelta
(
days
=
0x7FFFFFFF
)
self
.
date_end
=
self
.
date_start
+
datetime
.
timedelta
(
days
=
424242
)
if
self
.
club
.
membership_end
is
not
None
and
self
.
date_end
>
self
.
club
.
membership_end
:
self
.
date_end
=
self
.
club
.
membership_end
...
...
This diff is collapsed.
Click to expand it.
apps/member/views.py
+
4
−
4
View file @
92ab5ee3
...
...
@@ -374,12 +374,12 @@ class ClubAddMemberView(ProtectQuerysetMixin, LoginRequiredMixin, CreateView):
form
.
add_error
(
'
user
'
,
_
(
'
User is already a member of the club
'
))
return
super
().
form_invalid
(
form
)
if
form
.
instance
.
date_start
<
form
.
instance
.
club
.
membership_start
:
if
form
.
instance
.
club
.
membership_start
and
form
.
instance
.
date_start
<
form
.
instance
.
club
.
membership_start
:
form
.
add_error
(
'
user
'
,
_
(
"
The membership must start after {:%m-%d-%Y}.
"
)
.
format
(
form
.
instance
.
club
.
membership_start
))
return
super
().
form_invalid
(
form
)
if
form
.
instance
.
date_start
>
form
.
instance
.
club
.
membership_end
:
if
form
.
instance
.
club
.
membership_end
and
form
.
instance
.
date_start
>
form
.
instance
.
club
.
membership_end
:
form
.
add_error
(
'
user
'
,
_
(
"
The membership must begin before {:%m-%d-%Y}.
"
)
.
format
(
form
.
instance
.
club
.
membership_start
))
return
super
().
form_invalid
(
form
)
...
...
@@ -406,12 +406,12 @@ class ClubManageRolesView(ProtectQuerysetMixin, LoginRequiredMixin, UpdateView):
return
context
def
form_valid
(
self
,
form
):
if
form
.
instance
.
date_start
<
form
.
instance
.
club
.
membership_start
:
if
form
.
instance
.
club
.
membership_start
and
form
.
instance
.
date_start
<
form
.
instance
.
club
.
membership_start
:
form
.
add_error
(
'
user
'
,
_
(
"
The membership must start after {:%m-%d-%Y}.
"
)
.
format
(
form
.
instance
.
club
.
membership_start
))
return
super
().
form_invalid
(
form
)
if
form
.
instance
.
date_start
>
form
.
instance
.
club
.
membership_end
:
if
form
.
instance
.
club
.
membership_end
and
form
.
instance
.
date_start
>
form
.
instance
.
club
.
membership_end
:
form
.
add_error
(
'
user
'
,
_
(
"
The membership must begin before {:%m-%d-%Y}.
"
)
.
format
(
form
.
instance
.
club
.
membership_start
))
return
super
().
form_invalid
(
form
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment