Skip to content
Snippets Groups Projects
Verified Commit 7abf8e9d authored by Jonathan Weth's avatar Jonathan Weth :keyboard:
Browse files

Fix use of datetime in announcement form

parent e91551da
No related branches found
No related tags found
1 merge request!184Improve announcement queries
from datetime import time from datetime import time, datetime
from typing import Optional from typing import Optional
from django import forms from django import forms
...@@ -167,9 +167,9 @@ class AnnouncementForm(ExtensibleForm): ...@@ -167,9 +167,9 @@ class AnnouncementForm(ExtensibleForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
if "instance" not in kwargs: if "instance" not in kwargs:
kwargs["initial"] = { kwargs["initial"] = {
"valid_from_date": timezone.now(), "valid_from_date": datetime.now(),
"valid_from_time": time(0, 0), "valid_from_time": time(0, 0),
"valid_until_date": timezone.now(), "valid_until_date": datetime.now(),
"valid_until_time": time(23, 59), "valid_until_time": time(23, 59),
} }
else: else:
...@@ -195,10 +195,10 @@ class AnnouncementForm(ExtensibleForm): ...@@ -195,10 +195,10 @@ class AnnouncementForm(ExtensibleForm):
until_date = data["valid_until_date"] until_date = data["valid_until_date"]
until_time = data["valid_until_time"] until_time = data["valid_until_time"]
valid_from = timezone.datetime.combine(from_date, from_time) valid_from = datetime.combine(from_date, from_time)
valid_until = timezone.datetime.combine(until_date, until_time) valid_until = datetime.combine(until_date, until_time)
if valid_until < timezone.now(): if valid_until < datetime.now():
raise ValidationError( raise ValidationError(
_("You are not allowed to create announcements which are only valid in the past.") _("You are not allowed to create announcements which are only valid in the past.")
) )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment