Skip to content

Commit 73f3215

Browse files
committed
Use proper timezone when rendering tentative schedule slots
In particular, when publishing a schedule we'd use the server default timezone when showing the difference (reported in #180) and also when adding new sessions. Fixes #180
1 parent 6946895 commit 73f3215

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

postgresqleu/confreg/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from postgresqleu.util.validators import color_validator
2424
from postgresqleu.util.forms import ChoiceArrayField
2525
from postgresqleu.util.fields import LowercaseEmailField, ImageBinaryField, PdfBinaryField
26-
from postgresqleu.util.time import today_conference
26+
from postgresqleu.util.time import today_conference, datetime_string
2727
from postgresqleu.util.db import exec_no_result
2828
from postgresqleu.util.image import rescale_image_bytes
2929
from postgresqleu.util.currency import format_currency
@@ -1130,7 +1130,7 @@ class ConferenceSessionScheduleSlot(models.Model):
11301130
endtime = models.DateTimeField(null=False, blank=False, verbose_name="End time")
11311131

11321132
def __str__(self):
1133-
return "%s - %s" % (self.starttime, self.endtime)
1133+
return "%s - %s" % (datetime_string(self.starttime), datetime_string(self.endtime))
11341134

11351135

11361136
class ConferenceSessionTag(models.Model):

postgresqleu/confreg/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@
7979
from postgresqleu.util.db import exec_no_result, exec_to_list, exec_to_scalar, conditional_exec_to_scalar
8080
from postgresqleu.util.db import ensure_conference_timezone
8181
from postgresqleu.util.qr import generate_base64_qr
82+
from postgresqleu.util.time import datetime_string
8283
from postgresqleu.scheduler.util import trigger_immediate_job_run
8384

8485
from decimal import Decimal
@@ -3232,7 +3233,7 @@ def publishschedule(request, confname):
32323233
if s.starttime:
32333234
# Has an existing time, did it change?
32343235
if s.starttime != s.tentativescheduleslot.starttime or s.endtime != s.tentativescheduleslot.endtime:
3235-
changes.append("Session '%s': moved from '%s' to '%s'" % (s.title, s.starttime, s.tentativescheduleslot.starttime))
3236+
changes.append("Session '%s': moved from '%s' to '%s'" % (s.title, datetime_string(s.starttime), datetime_string(s.tentativescheduleslot.starttime)))
32363237
s.starttime = s.tentativescheduleslot.starttime
32373238
s.endtime = s.tentativescheduleslot.endtime
32383239
dirty = True

0 commit comments

Comments
 (0)