[588228] Force num_voted to 0 if None or ''

apps/search/tests/test_search.py

@@ -25,7 +25,6 @@
                             DiscussionClient, SearchError)
 from sumo.models import WikiPage
 from forums.models import Post
-import forums.tests as forum_tests
 
 
 def render(s, context):
@@ -148,7 +147,7 @@ class SphinxTestCase(test_utils.TransactionTestCase):
     """
 
     fixtures = ['pages.json', 'categories.json', 'users.json',
-                'posts.json', 'questions.json',]
+                'posts.json', 'questions.json', ]
     sphinx = True
     sphinx_is_running = False
 
@@ -316,6 +315,11 @@ def test_sort_mode(self):
                     results[-1]['attrs'][test_for[i]])
             i += 1
 
+    def test_num_voted_none(self):
+        qs = {'q': '', 'w': 2, 'a': 1, 'num_voted': 2, 'num_votes': ''}
+        response = self.client.get(reverse('search'), qs)
+        eq_(200, response.status_code)
+
     def test_created(self):
         """Basic functionality of created filter."""
 

apps/search/views.py

@@ -61,6 +61,8 @@ def clean(self):
                     cleaned_data[field_option] = None
 
             # Validate all integer fields
+            if not cleaned_data.get('num_votes'):
+                cleaned_data['num_votes'] = 0
 
             # Set defaults for MultipleChoiceFields and convert to ints.
             # Ticket #12398 adds TypedMultipleChoiceField which would replace