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
9abe0965
Verified
Commit
9abe0965
authored
Aug 29, 2018
by
Sébastiaan Versteeg
Browse files
Do not create scheduled messages if they would be in the past
parent
78b76b50
Changes
1
Hide whitespace changes
Inline
Side-by-side
website/events/models.py
View file @
9abe0965
...
...
@@ -282,9 +282,12 @@ class Event(models.Model, metaclass=ModelTranslateMeta):
def
save
(
self
,
*
args
,
**
kwargs
):
if
self
.
published
:
if
self
.
registration_required
:
registration_reminder_time
=
(
self
.
registration_start
-
timezone
.
timedelta
(
hours
=
1
))
registration_reminder
=
ScheduledMessage
()
if
(
self
.
registration_reminder
is
not
None
and
not
self
.
registration_reminder
.
sent
):
and
not
self
.
registration_reminder
.
sent
and
registration_reminder_time
>
timezone
.
now
()):
registration_reminder
=
self
.
registration_reminder
registration_reminder
.
title_en
=
'Event registration'
registration_reminder
.
title_nl
=
'Evenement registratie'
...
...
@@ -296,16 +299,17 @@ class Event(models.Model, metaclass=ModelTranslateMeta):
.
format
(
self
.
title_nl
))
registration_reminder
.
category
=
Category
.
objects
.
get
(
key
=
'event'
)
registration_reminder
.
time
=
(
self
.
registration_start
-
timezone
.
timedelta
(
hours
=
1
))
registration_reminder
.
time
=
registration_reminder_time
registration_reminder
.
save
()
self
.
registration_reminder
=
registration_reminder
self
.
registration_reminder
.
users
.
set
(
Member
.
active_members
.
all
())
start_reminder_time
=
(
self
.
start
-
timezone
.
timedelta
(
hours
=
1
))
start_reminder
=
ScheduledMessage
()
if
(
self
.
start_reminder
is
not
None
and
not
self
.
start_reminder
.
sent
):
and
not
self
.
start_reminder
.
sent
and
start_reminder_time
>
timezone
.
now
()):
start_reminder
=
self
.
start_reminder
start_reminder
.
title_en
=
'Event'
start_reminder
.
title_nl
=
'Evenement'
...
...
@@ -314,7 +318,7 @@ class Event(models.Model, metaclass=ModelTranslateMeta):
start_reminder
.
body_nl
=
(
'
\'
{}
\'
begint over '
'1 uur'
.
format
(
self
.
title_nl
))
start_reminder
.
category
=
Category
.
objects
.
get
(
key
=
'event'
)
start_reminder
.
time
=
(
self
.
start
-
timezone
.
timedelta
(
hours
=
1
))
start_reminder
.
time
=
start_reminder_time
start_reminder
.
save
()
self
.
start_reminder
=
start_reminder
if
self
.
registration_required
:
...
...
Thom Wiggers
📐
@twiggers
mentioned in commit
ed94fae4
·
Aug 29, 2018
mentioned in commit
ed94fae4
mentioned in commit ed94fae4c00b8591607c2682d7041164e3d6ff23
Toggle commit list
Thom Wiggers
📐
@twiggers
mentioned in commit
641015ce
·
Aug 29, 2018
mentioned in commit
641015ce
mentioned in commit 641015ce4df5155d11478d0c1946e876b2ef2bf6
Toggle commit list
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