fixed empty user search

Author: jamesturk

anthill/people/forms.py

@@ -19,6 +19,14 @@ class SearchForm(forms.Form):
     location_range = forms.ChoiceField(choices=DISTANCE_CHOICES, initial='50',
                                        required=False)
 
+    def clean(self):
+        cleaned_data = self.cleaned_data
+        if not (cleaned_data['location'] or cleaned_data['skills'] or
+                cleaned_data['name'] or cleaned_data['position']):
+            raise forms.ValidationError("No search parameters specified")
+        return cleaned_data
+
+
 class ProfileForm(forms.Form):
     name = forms.CharField(label='Name', required=False)
     email = forms.CharField(label='Email')

anthill/people/views.py

@@ -10,29 +10,29 @@
 from anthill.people.forms import SearchForm, ProfileForm, PasswordForm, UserContactForm
 
 def search(request):
+    context = { 'form': SearchForm() }
+
     if request.GET:
         form = SearchForm(request.GET)
-        form.is_valid()
-        location = form.cleaned_data['location']
-        skills = form.cleaned_data['skills']
-        name = form.cleaned_data['name']
-        position = form.cleaned_data['position']
-        location_range = form.cleaned_data['location_range']
+        if form.is_valid():
+            location = form.cleaned_data['location']
+            skills = form.cleaned_data['skills']
+            name = form.cleaned_data['name']
+            position = form.cleaned_data['position']
+            location_range = form.cleaned_data['location_range']
 
-        users = Profile.objects.all().select_related().exclude(user__id=request.user.id)
-        if skills:
-            tags = [t.strip() for t in skills.split(',')]
-            for tag in tags:
-                users = users.filter(skills__icontains=tag)
-        if position:
-            users = users.filter(role=position)
-        if name:
-            users = users.filter(user__first_name__icontains=name)
-        if location:
-            users = users.search_by_distance(location, location_range)
-        context = { 'form': form, 'searched': True, 'search_results': users }
-    else:
-        context = { 'form': SearchForm() }
+            users = Profile.objects.all().select_related().exclude(user__id=request.user.id)
+            if skills:
+                tags = [t.strip() for t in skills.split(',')]
+                for tag in tags:
+                    users = users.filter(skills__icontains=tag)
+            if position:
+                users = users.filter(role=position)
+            if name:
+                users = users.filter(user__first_name__icontains=name)
+            if location:
+                users = users.search_by_distance(location, location_range)
+            context = { 'form': form, 'searched': True, 'search_results': users }
 
     return render_to_response('people/search.html', context,
                              context_instance=RequestContext(request))