Cherry-pick PR 1316

Author: MisterRios

conference/models.py

@@ -743,7 +743,10 @@ def get_schedule_url(self):
         if not event:
             return None
 
-        return event.schedule.get_absolute_url() + '?' + urlencode({'selected': self.slug})
+        url = event.schedule.get_absolute_url()
+        slug = urlencode({'selected': self.slug})
+        time = event.start_time.strftime('%H:%M-UTC')
+        return f"{url}?{slug}#{time}"
 
     def get_slides_url(self):
 

tests/test_talks.py

@@ -7,7 +7,13 @@
 from django.utils import timezone
 
 from conference.models import TALK_STATUS, TALK_LEVEL
-from tests.factories import UserFactory, TalkFactory, ConferenceTagFactory, TalkSpeakerFactory
+from tests.factories import (
+    EventFactory,
+    UserFactory,
+    TalkFactory,
+    ConferenceTagFactory,
+    TalkSpeakerFactory,
+)
 from tests.common_tools import get_default_conference, redirects_to, template_used, make_user
 
 pytestmark = [pytest.mark.django_db]
@@ -279,3 +285,18 @@ def test_talk_for_other_than_current_conference(client):
     resp = client.get(url)
 
     assert resp.status_code == 404
+
+
+def test_show_talk_link_in_schedule(client):
+    """
+    The talk url points to the schedule, with correct talk slug, and time in utc
+    """
+    get_default_conference()
+    talk = TalkFactory(status=TALK_STATUS.accepted)
+    event = EventFactory(talk=talk)
+    url = talk.get_absolute_url()
+
+    response = client.get(url)
+
+    start_time = event.start_time.strftime('%H:%M-UTC')
+    assert f"{talk.slug}#{start_time}" in response.content.decode()