Merge branch 'master' of git.general-servers.com:expomap/expomap into develop

functions/search_forms.py

@@ -171,7 +171,9 @@ class AbstactSearchForm(forms.Form):
         if not self.is_valid():
             return EmptySearchQuerySet()
         q = self.cleaned_data.get('q')
+        q = q.strip()
         w = self.cleaned_data.get('w')
+        w = w.strip()
         fr = self.cleaned_data.get('fr')
         to = self.cleaned_data.get('to')
         th = self.cleaned_data.get('th')

functions/search_mixin.py

@@ -10,11 +10,11 @@ class ExpoSearchMixin(object):
         if obj.country:
             country = [tr.name for tr in obj.country.translations.all()]
         else:
-            country = ''
+            country = []
         if obj.city:
             city = [tr.name for tr in obj.city.translations.all()]
         else:
-            city = ''
+            city = []
 
         return country + city