Merge pull request #1 from gandalfar/fea_search_get

make past_events GET variable work, make past events label clickable

Author: Mateja Verlic

api/processors.py

@@ -99,7 +99,6 @@ def get_filtered_events(search_filter=None, country_filter=None, theme_filter=No
 		filter_kwargs['theme__in'] = theme_filter
 
 	if audience_filter:
-		audience = EventAudience.objects.filter()
 		filter_kwargs['audience__in'] = audience_filter
 
 	if len(filter_args) > 0:

web/forms/event_form.py

@@ -200,7 +200,9 @@ def __init__(self, *args, **kwargs):
 		search_query = kwargs.pop('q', None)
 		theme = kwargs.pop('theme', None)
 		audience = kwargs.pop('audience', None)
+
 		super(SearchEventForm, self).__init__(*args, **kwargs)
+
 		if country_code:
 			self.fields['country'].initial = country_code
 		self.fields['past_events'].initial = past_events
@@ -210,7 +212,3 @@ def __init__(self, *args, **kwargs):
 			self.fields['theme'].initial = theme
 		if audience:
 			self.fields['audience'].initial = audience
-
-
-
-

web/templates/pages/search_events.html

@@ -22,12 +22,12 @@
 					</div>
 					<div class="row">
 						<div class="col-md-4">
-							<label for="id_country">{{ form.fields.country.label }}</label>
+							<label for="{{ form.country.id_for_label }}">{{ form.fields.country.label }}</label>
 							{{ form.country }}
 							<div class="search-checkbox">
 								<hr>
 								{{ form.past_events }}
-								<label for="id_include_past">{{ form.past_events.label }}</label> 
+								<label for="{{ form.past_events.id_for_label }}">{{ form.past_events.label }}</label>
 							</div>
 							<div class="search-checkbox">
 								<hr>

web/views/events.py

@@ -260,8 +260,11 @@ def search_events(request):
 			country = get_country(country_filter, user_ip)
 			country_filter = country['country_code']
 
-		past = request.GET.get('past', None)
-		past_events = True if past and past=='yes' else False
+		past = request.GET.get('past_events', 'off')
+		if past == 'on':
+			past_events = True
+		else:
+			past_events = False
 
 		search_query = request.GET.get('q', '')
 
@@ -326,4 +329,4 @@ def change_status(request, event_id):
 def reject_status(request, event_id):
 	event = reject_event_status(event_id)
 
-	return HttpResponseRedirect(reverse('web.view_event', args=[event_id, event.slug]))
+	return HttpResponseRedirect(reverse('web.view_event', args=[event_id, event.slug]))