diff --git a/src/plainui/urls.py b/src/plainui/urls.py index de734a6ae70b8cbf442fb52546414227558527db..afa02ffa2b14189bd5da665947ae346f6d234f5b 100644 --- a/src/plainui/urls.py +++ b/src/plainui/urls.py @@ -51,6 +51,8 @@ urlpatterns = [ path('board/<int:pk>/delete', views.BoardEntryDeleteView.as_view(), name='board_entry_delete'), path('channels', views.ChannelEventsView.as_view(), name='channel_events'), path('fahrplan', views.FahrplanView.as_view(), name='fahrplan'), + path('fahrplan/events/<external_id>.html', views.EventByExternalIdView.as_view(), name='event_by_external_id'), + path('fahrplan/speakers/<external_id>.html', views.UserByExternalIdView.as_view(), name='user_by_external_id'), path('modify_favorites', views.ModifyFavoritesView.as_view(), name='modify_favorites'), path('modify_personal_calendar', views.ModifyPersonalCalendarView.as_view(), name='modify_personal_calendar'), path('modify_theme', views.ModifyThemeView.as_view(), name='modify_theme'), diff --git a/src/plainui/views/events.py b/src/plainui/views/events.py index 39484f3b240e76539221fbd217667f85176be133..00915670e6d0b799bde89842fc4a58b2ff7634da 100644 --- a/src/plainui/views/events.py +++ b/src/plainui/views/events.py @@ -1,6 +1,7 @@ __all__ = ( 'AssembliesEventsView', 'EventView', + 'EventByExternalIdView', 'UpcomingView', 'ChannelEventsView', 'SosList', @@ -25,6 +26,7 @@ from core.models import ( RoomLink, TagItem, ) +from core.models.schedules import ScheduleSourceMapping from plainui.views.utils import ConferenceRequiredMixin, event_filter, organize_events_for_calendar, session_get_favorite_events, session_get_scheduled_events @@ -92,6 +94,15 @@ class EventView(ConferenceRequiredMixin, TemplateView): return context +class EventByExternalIdView(ConferenceRequiredMixin, View): + def get(self, *args, external_id, **kwargs): + # TODO: What happens if there are multiple matching mappings? + # should we prefer import sources of official assemblies + # should we filter on the current conference? + m = get_object_or_404(ScheduleSourceMapping.objects.filter(mapping_type='event', source_id=external_id)) + return redirect(reverse('plainui:event', kwargs={'guid': m.local_id})) + + class UpcomingView(ConferenceRequiredMixin, TemplateView): template_name = 'plainui/upcoming.html' diff --git a/src/plainui/views/users.py b/src/plainui/views/users.py index c75bcd55e939e2af0c55fea7094f848abc68c492..d3c156dcd59846115b940fd43f925c35c45615fa 100644 --- a/src/plainui/views/users.py +++ b/src/plainui/views/users.py @@ -1,6 +1,7 @@ __all__ = ( 'UserView', 'UserByUuidView', + 'UserByExternalIdView', ) from django.db.models import Q @@ -14,6 +15,7 @@ from core.models import ( UserBadge, UserContact, ) +from core.models.schedules import ScheduleSourceMapping from plainui.views.utils import ( ConferenceRequiredMixin, @@ -69,3 +71,9 @@ class UserByUuidView(ConferenceRequiredMixin, View): def get(self, *args, uuid, **kwargs): user = get_object_or_404(PlatformUser.objects.filter(uuid=uuid)) return redirect(reverse('plainui:user', kwargs={'user_slug': user.slug})) + + +class UserByExternalIdView(ConferenceRequiredMixin, View): + def get(self, *args, external_id, **kwargs): + m = get_object_or_404(ScheduleSourceMapping.objects.filter(mapping_type='speaker', source_id=external_id)) + return redirect(reverse('plainui:user', kwargs={'user_id': m.local_id}))