Skip to content

Commit 6ec40bb

Browse files
committed
changes
1 parent 3f52e19 commit 6ec40bb

4 files changed

Lines changed: 8 additions & 7 deletions

File tree

backend/notifications/admin/admins.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def get_readonly_fields(self, request: HttpRequest, obj: Any | None = None):
6969
fields = super().get_readonly_fields(request, obj)
7070

7171
if obj:
72-
fields = fields + ["conference", "is_system_template"]
72+
fields = fields + ["conference", "is_system_template", "identifier"]
7373

7474
return fields
7575

backend/notifications/tests/admin/test_email_template_admin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ def test_cannot_edit_essential_fields_on_existing_object(rf):
5050

5151
assert "conference" in readonly_fields
5252
assert "is_system_template" in readonly_fields
53+
assert "identifier" in readonly_fields
5354

5455

5556
def test_can_edit_essential_fields_on_new_objects(rf):

backend/schedule/models.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
from dataclasses import dataclass
22
from datetime import datetime, timedelta
33
from typing import Optional
4+
from users.models import User
45
from conferences.querysets import ConferenceQuerySetMixin
56

67
from django.core import exceptions
@@ -335,8 +336,8 @@ def actual_attendees_total_capacity(self):
335336
return room.attendees_total_capacity if room else None
336337

337338
@cached_property
338-
def speakers(self):
339-
speakers = []
339+
def speakers(self) -> list[User]:
340+
speakers = set()
340341

341342
if self.submission_id:
342343
speakers.append(self.submission.speaker)
@@ -355,7 +356,7 @@ def speakers(self):
355356
speaker.user
356357
for speaker in sorted(additional_speakers, key=lambda speaker: speaker.id)
357358
)
358-
return [speaker for speaker in speakers if speaker is not None]
359+
return list([speaker for speaker in speakers if speaker is not None])
359360

360361
def clean(self):
361362
if self.type == ScheduleItem.TYPES.submission and not self.submission:

backend/schedule/tasks.py

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,10 +293,9 @@ def upload_schedule_item_video(*, sent_for_video_upload_state_id: int):
293293
else:
294294
logger.info("Video already uploaded for schedule_item_id=%s", schedule_item.id)
295295

296-
if not sent_for_video_upload.thumbnail_uploaded:
297-
video_id = video_id or schedule_item.youtube_video_id
298-
assert video_id, "Video marked as uploaded but Video ID is missing"
296+
assert video_id, "Video marked as uploaded but Video ID is missing"
299297

298+
if not sent_for_video_upload.thumbnail_uploaded:
300299
logger.info("Extracting thumbnail for schedule_item_id=%s", schedule_item.id)
301300

302301
thumbnail_path = extract_video_thumbnail(

0 commit comments

Comments
 (0)