Replaced value of parameter for past events

Author: sparkica

web/forms/event_form.py

@@ -168,7 +168,7 @@ class SearchEventForm(forms.Form):
 		required=False,
 		widget=forms.TextInput(attrs={'placeholder': 'Search for event name or tag', 'class': 'form-control'})
 	)
-	past_events = forms.BooleanField(
+	past = forms.BooleanField(
 		label='Include past events',
 		required=False,
 		widget=forms.CheckboxInput(attrs={'class': 'search-form-element'}),
@@ -205,7 +205,7 @@ def __init__(self, *args, **kwargs):
 
 		if country_code:
 			self.fields['country'].initial = country_code
-		self.fields['past_events'].initial = past_events
+		self.fields['past'].initial = past_events
 		if search_query:
 			self.fields['q'].initial = search_query
 		if theme:

web/templates/pages/index.html

@@ -33,10 +33,10 @@
 
 		<div class="container index-content">
 			<div id="past-events">
-				{% if past == 'yes' %}
+				{% if past == 'on' %}
 				<a id="past-link" href="{% url 'web.index' %}"><i class="fa fa-check-square-o"></i> 
 				{% else %}
-				<a id="past-link" href="{% url 'web.index' %}?past=yes"><i class="fa fa-square-o"></i>
+				<a id="past-link" href="{% url 'web.index' %}?past=on"><i class="fa fa-square-o"></i>
 				{% endif %}
 				Show past events</a>
 			</div>

web/templates/pages/scoreboard.html

@@ -11,7 +11,7 @@ <h1>#codeEU Events Scoreboard</h1>
 				<img src="/static/flags/{{ country.country_code|lower }}.png" alt="{{ country.country_name }}" />
 				<span class="icon-flag">
 					<span class="country-name">{{ country.country_name }}</span> is participating with 
-					 <span class="event-number"><a href="{% url 'web.search_events' %}?country_code={{ country.country_code }}&amp;past=yes">{{ country.events }}</span> event{% if country.events != 1 %}s{% endif %}</a>
+					 <span class="event-number"><a href="{% url 'web.search_events' %}?country_code={{ country.country_code }}&amp;past=on">{{ country.events }}</span> event{% if country.events != 1 %}s{% endif %}</a>
 				</span>
 			</div>
 		{% endfor %}

web/templates/pages/search_events.html

@@ -26,8 +26,8 @@
 							{{ form.country }}
 							<div class="search-checkbox">
 								<hr>
-								{{ form.past_events }}
-								<label for="{{ form.past_events.id_for_label }}">{{ form.past_events.label }}</label>
+								{{ form.past }}
+								<label for="{{ form.past.id_for_label }}">{{ form.past.label }}</label>
 							</div>
 							<div class="search-checkbox">
 								<hr>

web/views/events.py

@@ -49,7 +49,7 @@
 def index(request):
 	template = 'pages/index.html'
 
-	past = request.GET.get('past', 'no')
+	past = request.GET.get('past', 'off')
 
 	user_ip = get_client_ip(forwarded=request.META.get('HTTP_X_FORWARDED_FOR'),
 	                        remote=request.META.get('REMOTE_ADDR'))
@@ -264,7 +264,7 @@ def search_events(request):
 			country = get_country(country_filter, user_ip)
 			country_filter = country['country_code']
 
-		past = request.GET.get('past_events', 'off')
+		past = request.GET.get('past', False)
 		if past == 'on':
 			past_events = True
 		else:
@@ -282,7 +282,7 @@ def search_events(request):
 				country_filter = form.cleaned_data.get('country', None)
 				theme_filter = form.cleaned_data.get('theme', None)
 				audience_filter = form.cleaned_data.get('audience', None)
-				past_events = form.cleaned_data.get('past_events',None)
+				past_events = form.cleaned_data.get('past',None)
 
 				events = get_filtered_events(search_filter, country_filter, theme_filter, audience_filter, past_events)
 		else: