diff --git a/aleksis/core/forms.py b/aleksis/core/forms.py index 0daff5fd91fe2c45452025dd4d1e99bb7246953e..d49d42fb3048e365c93b12a7084f6a489f227931 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 aef59f28a6d81af6a0a970bdc90eedfdfe05f501..3d49754fb05baa4aa803e5295490ae6ac7192d18 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 9d019103d2e4b45558a5119c05b26a618d24be87..6ba27aacdc5e9fd76bed669e4882e704a0d3d488 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)