From 8d482077ad5f87dca69a409b6ba985d756bd8517 Mon Sep 17 00:00:00 2001 From: Samuel Clay Date: Fri, 17 Sep 2010 13:55:15 -0400 Subject: [PATCH] Email logins. --- apps/reader/forms.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/reader/forms.py b/apps/reader/forms.py index 3928e0e6f..017e31f2b 100644 --- a/apps/reader/forms.py +++ b/apps/reader/forms.py @@ -3,6 +3,7 @@ from django import forms from django.utils.translation import ugettext_lazy as _ from django.contrib.auth.models import User from django.contrib.auth import authenticate +from django.db.models import Q from apps.reader.models import Feature from utils import log as logging @@ -21,7 +22,7 @@ class LoginForm(forms.Form): username = self.cleaned_data.get('username').lower() password = self.cleaned_data.get('password', '') - user = User.objects.filter(username__iexact=username) + user = User.objects.filter(Q(username__iexact=username) | Q(email=username)) if username and user: self.user_cache = authenticate(username=user[0].username, password=password) if self.user_cache is None: