views/base: Include email addresses in submitter autocomplete search

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

diff --git a/apps/patchwork/views/base.py b/apps/patchwork/views/base.py
index 1539472e06505a3d05eab6ed88572068e4289804..634e383084817afe6403dda31378dad0e60c4017 100644 (file)
--- a/apps/patchwork/views/base.py
+++ b/apps/patchwork/views/base.py
@@ -25,6 +25,7 @@ from patchwork.requestcontext import PatchworkRequestContext
 from django.core import serializers, urlresolvers
 from django.template.loader import render_to_string
 from django.conf import settings
+from django.db.models import Q
 
 def projects(request):
     context = PatchworkRequestContext(request)
@@ -59,9 +60,12 @@ def pwclient(request):
     return response
 
 def confirm(request, key):
-    import patchwork.views.user
+    import patchwork.views.user, patchwork.views.mail
     views = {
         'userperson': patchwork.views.user.link_confirm,
+        'registration': patchwork.views.user.register_confirm,
+        'optout': patchwork.views.mail.optout_confirm,
+        'optin': patchwork.views.mail.optin_confirm,
     }
 
     conf = get_object_or_404(EmailConfirmation, key = key)
@@ -84,7 +88,8 @@ def submitter_complete(request):
     search = request.GET.get('q', '')
     response = HttpResponse(mimetype = "text/plain")
     if len(search) > 3:
-        queryset = Person.objects.filter(name__icontains = search)
+        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)
     return response