Merge branch 'master' of github.com:PythonBalkan/pyconbalkan

Author: Bojan Jovanovic

pyconbalkan/core/static/pdf/pycon-balkan-2018-timetable.pdf

@@ -22,7 +22,7 @@
             </li>
             <li class="menu__list__item">
             {% if conference.timetable_pdf %}
-                <a class="menu__list__link {% if request.path == conference.timetable_pdf.url %}active{% endif %}" href="{{ conference.timetable_pdf.url }}" role="button">Timetable</a>
+                <a class="menu__list__link {% if request.path == '/timetable_pdf' %}active{% endif %}" href="/timetable_pdf" role="button">Timetable</a>
             {% else %}
                 <a class="menu__list__link {% if request.path == '/timetable' %}active{% endif %}" href="{% url 'timetable' %}" role="button">Timetable</a>
             {% endif %}

pyconbalkan/core/templates/includes/header.html

@@ -1,7 +1,8 @@
 
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 from rest_framework import viewsets
 
+from pyconbalkan.conference.models import Conference
 from pyconbalkan.timetable.models import Room, Slot, Timetable
 from pyconbalkan.timetable.serializers import TimetableSerializer
 
@@ -11,6 +12,13 @@ class TimetableViewSet(viewsets.ModelViewSet):
     serializer_class = TimetableSerializer
 
 
+def timetable_pdf_view(request):
+    conference = Conference.objects.filter(active=True)
+    if conference and conference.first().timetable_pdf:
+        return redirect(conference.first().timetable_pdf.url)
+    return redirect('/')
+
+
 def timetable_view(request):
     slots_by_rooms = {}
     rooms = Room.objects.all()

pyconbalkan/timetable/views.py

@@ -26,7 +26,7 @@
 from pyconbalkan.speaker.views import *
 from pyconbalkan.sponsors.api_urls import router as sponsors
 
-from pyconbalkan.timetable.views import timetable_view
+from pyconbalkan.timetable.views import timetable_view, timetable_pdf_view
 from pyconbalkan.faq.views import faq_view
 from pyconbalkan.faq.api_urls import router as faq
 from pyconbalkan.sponsors.views import sponsor_view, sponsoring_view, sponsors_view
@@ -68,9 +68,9 @@
     path('admin/', admin.site.urls),
     path('api/', include(router.urls)),  # API
     path('markdownx/', include(markdownx)),
+    path('timetable_pdf/', timetable_pdf_view, name='timetable_pdf'),
     path('timetable/', timetable_view, name='timetable'),
     path('faq', faq_view, name='faq'),
-    path('timetable/', serve, {'path': 'pycon-balkan-2018-timetable.pdf', 'document_root': PDF_ROOT}, name='timetable'),
 ]
 
 # Add Django site authentication urls (for login, logout, password management)