Merge pull request #112 from PythonBalkan/bojan/conference_context_procesor

Removing conference from all views, fixes login conference missing ctx

Author: Kátia Nakamura

pyconbalkan/about/views.py

@@ -3,7 +3,6 @@
 
 from pyconbalkan.about.models import About
 from pyconbalkan.about.serializers import AboutSerializer
-from pyconbalkan.conference.models import Conference
 
 
 class AboutViewSet(viewsets.ModelViewSet):
@@ -12,10 +11,8 @@ class AboutViewSet(viewsets.ModelViewSet):
 
 
 def about_view(request):
-    conference = Conference.objects.filter(active=True)
     about = About.objects.filter(active=True)
     context = {
         'about': about.first() if about else None,
-        'conference': conference.first() if conference else None,
     }
     return render(request, 'about.html', context)

pyconbalkan/cfp/views.py

@@ -1,14 +1,13 @@
 from django.contrib.auth.decorators import login_required
 from django.core.mail import EmailMessage
-from django.db.models import F, Subquery, OuterRef
+from django.db.models import Subquery, OuterRef
 from django.shortcuts import render, get_object_or_404
 from rest_framework import viewsets
 from rest_framework.permissions import DjangoModelPermissions
 
 from pyconbalkan.cfp.forms import CfpForm, RateForm
 from pyconbalkan.cfp.models import Cfp, CFPRating
 from pyconbalkan.cfp.serializers import CfpSerializer
-from pyconbalkan.conference.models import Conference
 
 
 class CfpViewSet(viewsets.ModelViewSet):
@@ -18,10 +17,7 @@ class CfpViewSet(viewsets.ModelViewSet):
 
 
 def cfp_view(request):
-    conference = Conference.objects.filter(active=True)
-    context = {
-        'conference': conference.first() if conference else None,
-    }
+    context = {}
     if request.method == 'POST':
         form = CfpForm(request.POST)
         if form.is_valid():
@@ -45,25 +41,21 @@ def cfp_view(request):
 
 @login_required
 def cfp_list(request):
-    conference = Conference.objects.filter(active=True)
     cfps = Cfp.objects.annotate(
         my_rating=Subquery(CFPRating.objects.filter(cfp=OuterRef('pk'), user=request.user).values('mark'))
     )
 
     context = {
         'cfps': cfps,
-        'conference': conference.first() if conference else None,
     }
     return render(request, 'cfp_list.html', context)
 
 
 @login_required
 def cfp_detail(request, slug):
-    conference = Conference.objects.filter(active=True)
     cfp = get_object_or_404(Cfp, slug=slug)
     context = {
         'cfp': cfp,
-        'conference': conference.first() if conference else None,
     }
 
     initial = {

pyconbalkan/coc/views.py

@@ -3,7 +3,6 @@
 
 from .models import CodeOfConduct, ResponseGuide
 from .serializers import CodeOfConductSerializer
-from pyconbalkan.conference.models import Conference
 
 
 class CodeOfConductViewSet(viewsets.ModelViewSet):
@@ -12,13 +11,11 @@ class CodeOfConductViewSet(viewsets.ModelViewSet):
 
 
 def coc_view(request):
-    conference = Conference.objects.filter(active=True)
     coc = CodeOfConduct.objects.filter(active=True)
     r_guide = ResponseGuide.objects.filter(active=True)
     context = {
         'coc': coc.first() if coc else None,
         'response_guide': r_guide.first() if r_guide else None,
-        'conference': conference.first() if conference else None,
     }
     return render(request, 'coc.html', context)
 

pyconbalkan/contact/views.py

@@ -1,15 +1,10 @@
-from email.header import Header
-from email.mime.text import MIMEText
-
+from django.core.mail import EmailMessage
+from django.shortcuts import render
 from rest_framework import viewsets
 from rest_framework.permissions import AllowAny
 
-from pyconbalkan.conference.models import Conference
-from pyconbalkan.contact.serializers import ContactSerializer
 from pyconbalkan.contact.models import Contact
-from django.core.mail import EmailMessage
-from django.shortcuts import render
-
+from pyconbalkan.contact.serializers import ContactSerializer
 from .models import ContactForm
 
 
@@ -20,10 +15,7 @@ class ContactViewSet(viewsets.ModelViewSet):
 
 
 def contact_view(request):
-    conference = Conference.objects.filter(active=True)
-    context = {
-        'conference': conference.first() if conference else None,
-    }
+    context = {}
     if request.method == 'POST':
         form = ContactForm(request.POST)
         if form.is_valid():

pyconbalkan/core/context_processors.py

@@ -0,0 +1,9 @@
+from pyconbalkan.conference.models import Conference
+
+
+def conference(request):
+    conference = Conference.objects.filter(active=True)
+
+    return {
+        'conference': conference.first() if conference else None
+    }

pyconbalkan/core/views.py

@@ -25,7 +25,6 @@ def home(request):
         'gold_sponsors': gold_sponsors,
         'silver_sponsors': silver_sponsors,
         'partners': partners,
-        'conference': conference.first() if conference else None,
         'count_down': count_down.first() if count_down else None,
         'mission_statement': mission_statement.first() if mission_statement else None,
         'meta': conference.first().as_meta(),

pyconbalkan/news/views.py

@@ -16,17 +16,14 @@ class PostViewSet(viewsets.ModelViewSet):
 
 
 def news_view(request):
-    conference = Conference.objects.filter(active=True)
     posts = Post.objects.filter(active=True, published_date__lte=timezone.now())
     context = {
         'news': posts,
-        'conference': conference.first() if conference else None,
     }
     return render(request, 'news.html', context)
 
 
 def post_detail(request, slug):
-    conference = Conference.objects.filter(active=True)
     post = get_object_or_404(Post, active=True, slug=slug)
     meta = Meta(
         title=strip_tags(post.title),
@@ -39,7 +36,6 @@ def post_detail(request, slug):
     )
 
     context = {
-        'conference': conference.first() if conference else None,
         'post': post,
         'meta': meta,
     }

pyconbalkan/organizers/views.py

@@ -1,7 +1,6 @@
 from django.shortcuts import render, get_object_or_404
 from rest_framework import viewsets
 
-from pyconbalkan.conference.models import Conference
 from pyconbalkan.organizers.models import Volunteer
 from pyconbalkan.organizers.serializers import VolunteerSerializer
 
@@ -12,22 +11,18 @@ class VolunteerViewSet(viewsets.ModelViewSet):
 
 
 def organizer_view(request, slug):
-    conference = Conference.objects.filter(active=True)
     organizer = get_object_or_404(Volunteer, slug=slug)
     context = {
         'organizer': organizer,
-        'conference': conference.first() if conference else None,
     }
     return render(request, 'organizer.html', context)
 
 
 def organizers_listview(request):
     volunteers = Volunteer.objects.filter(type=Volunteer.VOLUNTEER, active=True)
     organizers = Volunteer.objects.filter(type=Volunteer.ORGANIZER, active=True)
-    conference = Conference.objects.filter(active=True)
     context = {
         'volunteers': volunteers,
         'organizers': organizers,
-        'conference': conference.first() if conference else None,
     }
     return render(request, 'organizers.html', context)

pyconbalkan/settings.py

@@ -85,6 +85,7 @@
             'context_processors': [
                 'django.template.context_processors.debug',
                 'django.template.context_processors.request',
+                'pyconbalkan.core.context_processors.conference',
                 'django.contrib.auth.context_processors.auth',
                 'django.contrib.messages.context_processors.messages',
             ],

pyconbalkan/speaker/views.py

@@ -1,7 +1,6 @@
 from django.shortcuts import render, get_object_or_404
 from rest_framework import viewsets
 
-from pyconbalkan.conference.models import Conference
 from pyconbalkan.speaker.models import Speaker
 from pyconbalkan.speaker.serializers import SpeakerSerializer
 
@@ -12,10 +11,8 @@ class SpeakerViewSet(viewsets.ModelViewSet):
 
 
 def speaker_detail(request, slug):
-    conference = Conference.objects.filter(active=True)
     speaker = get_object_or_404(Speaker, active=True, slug=slug)
     context = {
         'speaker': speaker,
-        'conference': conference.first() if conference else None,
     }
     return render(request, 'speaker.html', context)