Add a config option to FORCE_HTTPS_LINKS

[patchwork] / apps / patchwork / views / base.py

diff --git a/apps/patchwork/views/base.py b/apps/patchwork/views/base.py
index 634e383084817afe6403dda31378dad0e60c4017..fa7dd998335ac11ad163f41d84227570e4363efa 100644 (file)
--- a/apps/patchwork/views/base.py
+++ b/apps/patchwork/views/base.py
@@ -43,7 +43,7 @@ def pwclientrc(request, project_id):
     project = get_object_or_404(Project, linkname = project_id)
     context = PatchworkRequestContext(request)
     context.project = project
-    if request.is_secure():
+    if settings.FORCE_HTTPS_LINKS or request.is_secure():
         context['scheme'] = 'https'
     else:
         context['scheme'] = 'http'
@@ -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',