File tree Expand file tree Collapse file tree 6 files changed +20
-8
lines changed Expand file tree Collapse file tree 6 files changed +20
-8
lines changed Original file line number Diff line number Diff line change @@ -43,17 +43,21 @@ def cfp_view(request):
4343
4444@login_required
4545def cfp_list (request ):
46+ conference = Conference .objects .filter (active = True )
4647 cfps = Cfp .objects .all ()
4748 context = {
4849 'cfps' : cfps ,
50+ 'conference' : conference .first () if conference else None ,
4951 }
5052 return render (request , 'cfp_list.html' , context )
5153
5254
5355@login_required
5456def cfp_detail (request , slug ):
57+ conference = Conference .objects .filter (active = True )
5558 cfp = get_object_or_404 (Cfp , slug = slug )
5659 context = {
5760 'cfp' : cfp ,
61+ 'conference' : conference .first () if conference else None ,
5862 }
5963 return render (request , 'cfp_detail.html' , context )
Original file line number Diff line number Diff line change @@ -26,6 +26,7 @@ def news_view(request):
2626
2727
2828def post_detail (request , slug ):
29+ conference = Conference .objects .filter (active = True )
2930 post = get_object_or_404 (Post , active = True , slug = slug )
3031 meta = Meta (
3132 title = strip_tags (post .title ),
@@ -38,6 +39,7 @@ def post_detail(request, slug):
3839 )
3940
4041 context = {
42+ 'conference' : conference .first () if conference else None ,
4143 'post' : post ,
4244 'meta' : meta ,
4345 }
Original file line number Diff line number Diff line change @@ -12,9 +12,11 @@ class VolunteerViewSet(viewsets.ModelViewSet):
1212
1313
1414def organizer_view (request , slug ):
15+ conference = Conference .objects .filter (active = True )
1516 organizer = get_object_or_404 (Volunteer , slug = slug )
1617 context = {
1718 'organizer' : organizer ,
19+ 'conference' : conference .first () if conference else None ,
1820 }
1921 return render (request , 'organizer.html' , context )
2022
Original file line number Diff line number Diff line change 161161
162162LOGIN_URL = '/admin/'
163163META_DEFAULT_KEYWORDS = ['PyCon' , 'Balkan' ]
164- META_SITE_DOMAIN = 'https://pyconbalkan.com/'
165-
166- # Are we testing? i.e. was this code run via "manage.py test"
167- TESTING = len (sys .argv ) > 1 and sys .argv [1 ] == 'test'
168- # SSL redirect
169- SECURE_SSL_REDIRECT = False if TESTING else True
170164
171165if DEBUG :
172166 # Storage
175169 EMAIL_BACKEND = 'django.core.mail.backends.filebased.EmailBackend'
176170 EMAIL_FILE_PATH = '/tmp/app-emails'
177171else :
172+ TESTING = len (sys .argv ) > 1 and sys .argv [1 ] == 'test'
173+ SECURE_SSL_REDIRECT = False if TESTING else True
178174 # Storage
179175 DEFAULT_FILE_STORAGE = "pyconbalkan.core.storage.S3Storage"
180176 # Email
Original file line number Diff line number Diff line change 11from django .shortcuts import render , get_object_or_404
22from rest_framework import viewsets
33
4+ from pyconbalkan .conference .models import Conference
45from pyconbalkan .speaker .models import Speaker
56from pyconbalkan .speaker .serializers import SpeakerSerializer
67
@@ -11,8 +12,10 @@ class SpeakerViewSet(viewsets.ModelViewSet):
1112
1213
1314def speaker_detail (request , slug ):
15+ conference = Conference .objects .filter (active = True )
1416 speaker = get_object_or_404 (Speaker , active = True , slug = slug )
1517 context = {
16- 'speaker' : speaker
18+ 'speaker' : speaker ,
19+ 'conference' : conference .first () if conference else None ,
1720 }
1821 return render (request , 'speaker.html' , context )
Original file line number Diff line number Diff line change 22from rest_framework import viewsets
33from django .shortcuts import render , get_object_or_404
44
5+ from pyconbalkan .conference .models import Conference
56from pyconbalkan .sponsors .models import Sponsor
67from pyconbalkan .sponsors .serializers import SponsorSerializer
78
@@ -12,13 +13,17 @@ class SponsorsViewSet(viewsets.ModelViewSet):
1213
1314
1415def sponsor_view (request , id ):
16+ conference = Conference .objects .filter (active = True )
1517 sponsor = get_object_or_404 (Sponsor , id = id )
1618 context = {
1719 'sponsor' : sponsor ,
20+ 'conference' : conference .first () if conference else None ,
1821 }
1922 return render (request , 'sponsor.html' , context )
2023
2124def sponsors_view (request ):
2225 sponsors = Sponsor .objects .all ()
23- context = {'sponsors' : sponsors }
26+ context = {
27+ 'sponsors' : sponsors ,
28+ }
2429 return render (request , 'sponsors.html' , context )
You can’t perform that action at this time.
0 commit comments