diff --git a/src/core/templatetags/conference_time.py b/src/core/templatetags/conference_time.py new file mode 100644 index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 diff --git a/src/plainui/views/general.py b/src/plainui/views/general.py index bf9e14f23aaaf45b55b8abdbb5bda015cfd68a02..bc3f1074e19ccc541411782fffbddfc26074fe79 100644 --- a/src/plainui/views/general.py +++ b/src/plainui/views/general.py @@ -126,10 +126,12 @@ class TagView(ConferenceRequiredMixin, TemplateView): context['tag'] = tag # TODO other types. What should we link here? + # TODO: consider using views.utils.event_filter() here context['events'] = ( Event.objects.conference_accessible(self.conf) .filter(id__in=TagItem.objects.filter(tag=tag, target_type=ContentType.objects.get_for_model(Event)).values_list('target_id')) .filter(schedule_start__isnull=False, schedule_end__isnull=False) + .order_by('schedule_start', 'schedule_end') ) context['my_favorite_events'] = session_get_favorite_events(self.request.session, self.request.user)