Skip to content
Snippets Groups Projects
Commit f5e6c665 authored by HeJ's avatar HeJ
Browse files

schedule import bugfix: use str() on uuids before joining them

parent b337e38e
Branches
No related tags found
No related merge requests found
...@@ -162,7 +162,7 @@ class ScheduleSource(models.Model): ...@@ -162,7 +162,7 @@ class ScheduleSource(models.Model):
# the very bad case: we found too many # the very bad case: we found too many
if len(candidates) > 1: if len(candidates) > 1:
raise ValueError('Multiple candidate speakers found: ' + '; '.join(x.pk for x in candidates)) raise ValueError('Multiple candidate speakers found: ' + '; '.join(str(x.pk) for x in candidates))
# hail mary attempt: see if we have an imported speaker with the same name # hail mary attempt: see if we have an imported speaker with the same name
candidates = self.conference.users.select_related('user').filter(user__user_type=PlatformUser.Type.SPEAKER, user__display_name=name).all() candidates = self.conference.users.select_related('user').filter(user__user_type=PlatformUser.Type.SPEAKER, user__display_name=name).all()
...@@ -787,6 +787,7 @@ class ScheduleSourceImport(models.Model): ...@@ -787,6 +787,7 @@ class ScheduleSourceImport(models.Model):
return False return False
self.start = timezone.now() self.start = timezone.now()
self.end = None
self.state = self.State.STARTED self.state = self.State.STARTED
self.save(update_fields=['start', 'state']) self.save(update_fields=['start', 'state'])
logger.info('[job %s] starting import', self.pk) logger.info('[job %s] starting import', self.pk)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment