views/base: Implement limit for submitter autocompletion

Add a limit parameter to the completion view, and pass a limit of 20
results in the javascript.

Signed-off-by: Jeremy Kerr <jk@ozlabs.org>

diff --git a/apps/patchwork/tests/person.py b/apps/patchwork/tests/person.py
index 63bbadb7304fa2e17c903d046f4188b5bef148f4..d94809619d73ad5e18bf87fe5aa21d04bce519a5 100644 (file)
--- a/apps/patchwork/tests/person.py
+++ b/apps/patchwork/tests/person.py
@@ -44,3 +44,12 @@ class SubmitterCompletionTest(TestCase):
         data = json.loads(response.content)
         self.assertEquals(len(data), 1)
         self.assertEquals(data[0]['fields']['email'], 'test2@example.com')
+
+    def testCompleteLimit(self):
+        for i in range(3,10):
+            person = Person(email = 'test%d@example.com' % i)
+            person.save()
+        response = self.client.get('/submitter/', {'q': 'test', 'l': 5})
+        self.assertEquals(response.status_code, 200)
+        data = json.loads(response.content)
+        self.assertEquals(len(data), 5)

diff --git a/apps/patchwork/views/base.py b/apps/patchwork/views/base.py
index 634e383084817afe6403dda31378dad0e60c4017..7707653e9fa9fab13593a8653ed79dbe55235e39 100644 (file)
--- a/apps/patchwork/views/base.py
+++ b/apps/patchwork/views/base.py
@@ -86,12 +86,25 @@ def confirm(request, key):
 
 def submitter_complete(request):
     search = request.GET.get('q', '')
+    limit = request.GET.get('l', None)
     response = HttpResponse(mimetype = "text/plain")
-    if len(search) > 3:
-        queryset = Person.objects.filter(Q(name__icontains = search) |
-                                         Q(email__icontains = search))
-        json_serializer = serializers.get_serializer("json")()
-        json_serializer.serialize(queryset, ensure_ascii=False, stream=response)
+
+    if len(search) <= 3:
+        return response
+
+    queryset = Person.objects.filter(Q(name__icontains = search) |
+                                     Q(email__icontains = search))
+    if limit is not None:
+        try:
+            limit = int(limit)
+        except ValueError:
+            limit = None
+
+    if limit is not None and limit > 0:
+            queryset = queryset[:limit]
+
+    json_serializer = serializers.get_serializer("json")()
+    json_serializer.serialize(queryset, ensure_ascii=False, stream=response)
     return response
 
 help_pages = {'':           'index.html',

diff --git a/templates/patchwork/filters.html b/templates/patchwork/filters.html
index 36981014f07123b47cb5594e67d1062643d0211e..c0b8f5a7be793c0d9e59b9790729787b83c1c79c 100644 (file)
--- a/templates/patchwork/filters.html
+++ b/templates/patchwork/filters.html
@@ -122,6 +122,7 @@ function submitter_complete_response()
 
 function submitter_field_change(field)
 {
+    var limit = 20;
     var value = field.value;
     if (value.length < 4) {
         return;
@@ -131,7 +132,8 @@ function submitter_field_change(field)
          return;
     }
 
-    var url = '{% url patchwork.views.submitter_complete %}?q=' + value;
+    var url = '{% url patchwork.views.submitter_complete %}?q=' + value +
+                        '&l=' + limit;
     req = new XMLHttpRequest();
     req.onreadystatechange = submitter_complete_response;
     req.open("GET", url, true);