Merge pull request #255 from sparkica/country_less

Added support to search by all countries

Author: ercchy

api/models/events.py

@@ -38,6 +38,12 @@ class Event(models.Model):
 		('PENDING', 'Pending'),
 	    ('REJECTED', 'Rejected'),
 	)
+
+	CUSTOM_COUNTRY_ENTRIES = (
+		('00',' All countries'),
+		('01','---------------'),
+	)
+
 	status = models.CharField(max_length=50, choices=STATUS_CHOICES, default='PENDING')
 	title = models.CharField(max_length=255, default=None)
 	slug = models.SlugField(max_length=255, null=True, blank=True)

api/processors.py

@@ -89,7 +89,7 @@ def get_filtered_events(search_filter=None, country_filter=None, theme_filter=No
 		filter_args = (Q(title__icontains=search_filter) | Q(description__icontains=search_filter) | Q(tags__name__icontains=search_filter) 
 			| Q(organizer__icontains=search_filter) | Q(location__icontains=search_filter),)
 
-	if country_filter:
+	if country_filter and country_filter not in [ custom_country[0] for custom_country in Event.CUSTOM_COUNTRY_ENTRIES ]:
 		filter_kwargs['country'] = country_filter
 
 	if theme_filter:

web/forms/event_form.py

@@ -155,9 +155,12 @@ def __init__(self, *args, **kwargs):
 
 class SearchEventForm(forms.Form):
 
+	countries._countries.append(Event.CUSTOM_COUNTRY_ENTRIES[0])
+	countries._countries.append(Event.CUSTOM_COUNTRY_ENTRIES[1])
+
 	search = forms.CharField(
 		required=False,
-		widget=forms.TextInput(attrs={'placeholder': 'Search some serious events', 'class': 'form-control'})
+		widget=forms.TextInput(attrs={'placeholder': 'Search for event name or tag', 'class': 'form-control'})
 	)
 	country = forms.ChoiceField(
 		label='Select country',