From f82cf3768c9bcc1a2ab1b7a439674c4d462c102d Mon Sep 17 00:00:00 2001
From: Tom Teichler <tom.teichler@teckids.org>
Date: Wed, 11 Mar 2020 21:24:25 +0100
Subject: [PATCH] Fix getting date
---
aleksis/core/forms.py | 6 +++---
aleksis/core/models.py | 4 ++--
aleksis/core/util/core_helpers.py | 2 +-
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/aleksis/core/forms.py b/aleksis/core/forms.py
index 0daff5fd9..d49d42fb3 100644
--- a/aleksis/core/forms.py
+++ b/aleksis/core/forms.py
@@ -166,9 +166,9 @@ class AnnouncementForm(forms.ModelForm):
def __init__(self, *args, **kwargs):
if "instance" not in kwargs:
kwargs["initial"] = {
- "valid_from_date": timezone.datetime.now(),
+ "valid_from_date": timezone.now(),
"valid_from_time": time(0, 0),
- "valid_until_date": timezone.datetime.now(),
+ "valid_until_date": timezone.now(),
"valid_until_time": time(23, 59),
}
else:
@@ -197,7 +197,7 @@ class AnnouncementForm(forms.ModelForm):
valid_from = timezone.datetime.combine(from_date, from_time)
valid_until = timezone.datetime.combine(until_date, until_time)
- if valid_until < timezone.datetime.now():
+ if valid_until < timezone.now():
raise ValidationError(
_("You are not allowed to create announcements which are only valid in the past.")
)
diff --git a/aleksis/core/models.py b/aleksis/core/models.py
index aef59f28a..3d49754fb 100644
--- a/aleksis/core/models.py
+++ b/aleksis/core/models.py
@@ -283,7 +283,7 @@ class Announcement(ExtensibleModel):
link = models.URLField(blank=True, verbose_name=_("Link"))
valid_from = models.DateTimeField(
- verbose_name=_("Date and time from when to show"), default=timezone.datetime.now
+ verbose_name=_("Date and time from when to show"), default=timezone.now
)
valid_until = models.DateTimeField(
verbose_name=_("Date and time until when to show"),
@@ -308,7 +308,7 @@ class Announcement(ExtensibleModel):
@classmethod
def for_person_at_time(cls, person: Person, when: Optional[datetime] = None) -> List:
""" Get all announcements for one person at a certain time """
- when = when or timezone.datetime.now()
+ when = when or timezone.now()
# Get announcements by time
announcements = cls.objects.filter(valid_from__lte=when, valid_until__gte=when)
diff --git a/aleksis/core/util/core_helpers.py b/aleksis/core/util/core_helpers.py
index 9d019103d..6ba27aacd 100644
--- a/aleksis/core/util/core_helpers.py
+++ b/aleksis/core/util/core_helpers.py
@@ -154,4 +154,4 @@ def school_information_processor(request: HttpRequest) -> dict:
def now_tomorrow() -> datetime:
""" Return current time tomorrow """
- return timezone.datetime.now() + timedelta(days=1)
+ return timezone.now() + timedelta(days=1)
--
GitLab