From 30f4b245c065c009d8ca87dcb1cd80d1262ff0f4 2017-08-18 16:39:54 From: Christopher Neugebauer Date: 2017-08-18 16:39:54 Subject: [PATCH] Removes the ability to login by username \o. --- diff --git a/pinaxcon/account_hooks.py b/pinaxcon/account_hooks.py index e3affff3c4750f6fdfa6b6bf4327362383c4288e..6f2b0dde7857bfd9c6ce5f393cc4f7e88a828134 100644 --- a/pinaxcon/account_hooks.py +++ b/pinaxcon/account_hooks.py @@ -19,7 +19,6 @@ class BetterAccountHookSet(hooks.AccountDefaultHookSet): } def get_username_by_email(self, email): - try: return User.objects.get(email=email).username except User.DoesNotExist: diff --git a/pinaxcon/templates/account_login.html b/pinaxcon/templates/account_login.html index a660e25004b85b5a0636365c052abeebb0cd7293..a058d0c1e3e726e2392ca73f51d5402435bb0469 100644 --- a/pinaxcon/templates/account_login.html +++ b/pinaxcon/templates/account_login.html @@ -15,7 +15,7 @@
-
+

diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py index 2cd7bf6858634151e1333601534d375aac3545a6..eed7a6a070fea1f905923fce648a7a25a8e0bd81 100644 --- a/pinaxcon/urls.py +++ b/pinaxcon/urls.py @@ -53,7 +53,8 @@ urlpatterns = [ url(r"^admin/", include(admin.site.urls)), url(r"^login$", views.account_login, name="nbpy_login"), - url(r"^login_handle$", views.EmailLoginView.as_view(), name="nbpy_login_handle"), + # Override the default account_login view with one that takes email addys + url(r"^account/login/$", views.EmailLoginView.as_view(), name="account_login"), url(r"^account/", include("account.urls")), url(r"^dashboard/", symposion.views.dashboard, name="dashboard"),