From 1f78b05049ca7b1f660c5c01c7e379c36c933617 Mon Sep 17 00:00:00 2001
From: Ernesto Rico Schmidt <ernesto@helsinki.at>
Date: Wed, 15 Feb 2023 17:19:35 -0400
Subject: [PATCH] Fix resolve_conflicts to avoid rutime warnings
---
program/models.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/program/models.py b/program/models.py
index 58d52d66..01c99d52 100644
--- a/program/models.py
+++ b/program/models.py
@@ -995,7 +995,8 @@ class Schedule(models.Model):
# Collect upcoming timeslots to delete which might still remain
del_timeslots = TimeSlot.objects.filter(
- schedule=schedule, start__gt=schedule.last_date
+ schedule=schedule,
+ start__gt=timezone.make_aware(datetime.combine(schedule.last_date, time(0, 0)))
)
for del_ts in del_timeslots:
delete.append(del_ts)
--
GitLab