From 079c0deb5d1e7e47c3c4d4e50e58e5b2c323d74e Mon Sep 17 00:00:00 2001
From: Grollicus <cccvgitlab.db5c7b60@grollmann.eu>
Date: Sat, 26 Dec 2020 14:32:27 +0100
Subject: [PATCH] fixed tests
---
src/plainui/tests.py | 6 ++++--
src/plainui/views.py | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/plainui/tests.py b/src/plainui/tests.py
index 131b2e631..f7344af7c 100644
--- a/src/plainui/tests.py
+++ b/src/plainui/tests.py
@@ -1497,8 +1497,10 @@ class ViewsTest(TestCase):
assembly = Assembly(conference=self.conf, slug='assembly1', name='Assembly1', state=Assembly.State.PLACED)
assembly.save()
- room = Room(conference=self.conf, assembly=assembly, name='Some Room')
+ room = Room(conference=self.conf, assembly=assembly, name='Some Room', is_public_fahrplan=True)
room.save()
+ room2 = Room(conference=self.conf, assembly=assembly, name='Some Other Room', is_public_fahrplan=False)
+ room2.save()
event = Event(
conference=self.conf, assembly=assembly, name='Event1_1', is_public=True, room=room,
schedule_start=datetime(2020, 1, 2, 0, 0, 0, tzinfo=utc), schedule_duration=timedelta(minutes=45),
@@ -1512,7 +1514,7 @@ class ViewsTest(TestCase):
)
event2.save()
event3 = Event(
- conference=self.conf, assembly=assembly, name='Event1_3', is_public=True, room=room,
+ conference=self.conf, assembly=assembly, name='Event1_3', is_public=True, room=room2,
schedule_start=datetime(2020, 1, 2, 2, 0, 0, tzinfo=utc), schedule_duration=timedelta(minutes=45),
kind=Event.Kind.ASSEMBLY,
)
diff --git a/src/plainui/views.py b/src/plainui/views.py
index 8265b33cb..1c8b61bcc 100644
--- a/src/plainui/views.py
+++ b/src/plainui/views.py
@@ -1184,7 +1184,7 @@ class PublicFahrplanView(ConferenceRequiredMixin, TemplateView):
def get_context_data(self, **kwargs):
context = super().get_context_data(conf=self.conf, **kwargs)
context['mode'] = 'calendar'
- events = _event_filter(self.request.user, self.conf, curated=True, public_fahrplan=True)
+ events = _event_filter(self.request.user, self.conf, public_fahrplan=True)
context['events'] = _organize_events_for_calendar(self.conf, events)
return context
--
GitLab