Removed context_processor, and replaced fetching the conference from the request object

Bojan Jovanovic · Bojan Jovanovic · commit 4cef4911e721 · 2019-02-27T07:14:18.000+01:00
diff --git a/pyconbalkan/core/context_processors.py b/pyconbalkan/core/context_processors.py
diff --git a/pyconbalkan/core/templates/base.html b/pyconbalkan/core/templates/base.html
@@ -7,7 +7,7 @@
 <!--[if !IE]><!--> <html lang="en"> <!--<![endif]-->
 <head {% meta_namespaces %} >
     {% include "meta/meta.html" %}
-    <title>{{ conference.event }} {{ conference.name }} {{ conference.year }}</title>
+    <title>{{ request.conference.event }} {{ request.conference.name }} {{ request.conference.year }}</title>
 
     <!-- Meta -->
     <meta charset="utf-8">
diff --git a/pyconbalkan/core/templates/includes/event_sidebar.html b/pyconbalkan/core/templates/includes/event_sidebar.html
@@ -1,34 +1,34 @@
 {% load static %}
 
 <aside class="event-sidebar">
-    <a href="/" class="logo" title="{{ conference.event }} {{ conference.name }} - {{ conference.city }} {{ conference.year }}"></a>
+    <a href="/" class="logo" title="{{ request.conference.event }} {{ request.conference.name }} - {{ request.conference.city }} {{ request.conference.year }}"></a>
     <hr class="line">
-    <h1>#{{ conference.number }}</h1>
+    <h1>#{{ request.conference.number }}</h1>
     <p class="event-sidebar__text">
-        {{ conference.address }}, {{ conference.city }}
+        {{ request.conference.address }}, {{ request.conference.city }}
     </p>
     <p class="event-sidebar__text">
         <i class="event-sidebar__icon far fa-calendar-alt"></i>
-        {{ conference.from_date }} - {{ conference.to_date }}
+        {{ request.conference.from_date }} - {{ request.conference.to_date }}
     </p>
     <p class="event-sidebar__text">
         <i class="event-sidebar__icon fas fa-users"></i>
-        {{ conference.max_attendees }} attendees
+        {{ request.conference.max_attendees }} attendees
     </p>
     <p class="event-sidebar__text">
         <i class="event-sidebar__icon fas fa-globe"></i>
-        {{ conference.get_type_display }}
+        {{ request.conference.get_type_display }}
     </p>
 
     <div class="event-button__wrapper">
-        {% if conference.tickets %}
-            <a class="button button--yellow mb-xs-20" href="{{ conference.tickets }}" target="_blank" role="button">Join Us!</a>
+        {% if request.conference.tickets %}
+            <a class="button button--yellow mb-xs-20" href="{{ request.conference.tickets }}" target="_blank" role="button">Join Us!</a>
         {% endif %}
     </div>
     <div class="social__links mb-xs-10">
-    {% if conference.facebook %}<a href="{{ conference.facebook }}" class="facebook" target="_blank"></a>{% endif %}
-	{% if conference.instagram %}<a href="{{ conference.instagram }}" class="instagram" target="_blank"></a>{% endif %}
-	{% if conference.twitter %}<a href="{{ conference.twitter }}" class="twitter" target="_blank"></a>{% endif %}
+    {% if request.conference.facebook %}<a href="{{ request.conference.facebook }}" class="facebook" target="_blank"></a>{% endif %}
+	{% if request.conference.instagram %}<a href="{{ request.conference.instagram }}" class="instagram" target="_blank"></a>{% endif %}
+	{% if request.conference.twitter %}<a href="{{ request.conference.twitter }}" class="twitter" target="_blank"></a>{% endif %}
     </div>
     <h3 class="supported-by">Supported by</h3>
     <a href="https://www.python.org/psf/"><div><img class="psf-logo" src="{% static 'img/pfs-logo.png' %}"></div></a>
diff --git a/pyconbalkan/core/templates/includes/header.html b/pyconbalkan/core/templates/includes/header.html
@@ -21,7 +21,7 @@
                 </div>
             </li>
             <li class="menu__list__item">
-            {% if conference.timetable_pdf %}
+            {% if request.conference.timetable_pdf %}
                 <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>
diff --git a/pyconbalkan/settings.py b/pyconbalkan/settings.py
@@ -92,7 +92,6 @@
             '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',
             ],
diff --git a/pyconbalkan/sponsors/templates/sponsoring.html b/pyconbalkan/sponsors/templates/sponsoring.html
@@ -61,8 +61,8 @@ <h2 class="success-message">
     </div>
 
     <h2 class="centered">
-        {% if conference.sponsor_email %}
-            For more information, contact us by email {{ conference.sponsor_email }}
+        {% if request.conference.sponsor_email %}
+            For more information, contact us by email {{ request.conference.sponsor_email }}
         {% endif %}
     </h2>
 
