forked from GithubBackups/healthchecks
/admin/login/ uses the same login view as the main site.
This commit is contained in:
parent
c6c195b016
commit
a4bcbb28aa
@ -17,8 +17,8 @@ class ProfileBackend(BasicBackend):
|
|||||||
|
|
||||||
def authenticate(self, username=None, token=None):
|
def authenticate(self, username=None, token=None):
|
||||||
try:
|
try:
|
||||||
profile = (Profile.objects
|
profiles = Profile.objects.select_related("user")
|
||||||
.select_related("user").get(user__username=username))
|
profile = profiles.get(user__username=username)
|
||||||
except Profile.DoesNotExist:
|
except Profile.DoesNotExist:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
@ -27,9 +27,6 @@ class ProfileBackend(BasicBackend):
|
|||||||
|
|
||||||
return profile.user
|
return profile.user
|
||||||
|
|
||||||
def get_user(self, user_id):
|
|
||||||
return User.objects.filter(pk=user_id).first()
|
|
||||||
|
|
||||||
|
|
||||||
class EmailBackend(BasicBackend):
|
class EmailBackend(BasicBackend):
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@ def _associate_demo_check(request, user):
|
|||||||
del request.session["welcome_code"]
|
del request.session["welcome_code"]
|
||||||
|
|
||||||
|
|
||||||
def login(request):
|
def login(request, show_password=False):
|
||||||
bad_credentials = False
|
bad_credentials = False
|
||||||
if request.method == 'POST':
|
if request.method == 'POST':
|
||||||
form = EmailPasswordForm(request.POST)
|
form = EmailPasswordForm(request.POST)
|
||||||
@ -72,6 +72,7 @@ def login(request):
|
|||||||
auth_login(request, user)
|
auth_login(request, user)
|
||||||
return redirect("hc-checks")
|
return redirect("hc-checks")
|
||||||
bad_credentials = True
|
bad_credentials = True
|
||||||
|
show_password = True
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
user = User.objects.get(email=email)
|
user = User.objects.get(email=email)
|
||||||
@ -89,7 +90,8 @@ def login(request):
|
|||||||
ctx = {
|
ctx = {
|
||||||
"form": form,
|
"form": form,
|
||||||
"bad_credentials": bad_credentials,
|
"bad_credentials": bad_credentials,
|
||||||
"bad_link": bad_link
|
"bad_link": bad_link,
|
||||||
|
"show_password": show_password
|
||||||
}
|
}
|
||||||
return render(request, "accounts/login.html", ctx)
|
return render(request, "accounts/login.html", ctx)
|
||||||
|
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
from django.conf.urls import include, url
|
from django.conf.urls import include, url
|
||||||
from django.contrib import admin
|
from django.contrib import admin
|
||||||
|
|
||||||
|
from hc.accounts.views import login as hc_login
|
||||||
|
|
||||||
urlpatterns = [
|
urlpatterns = [
|
||||||
|
url(r'^admin/login/', hc_login, {"show_password": True}),
|
||||||
url(r'^admin/', include(admin.site.urls)),
|
url(r'^admin/', include(admin.site.urls)),
|
||||||
url(r'^accounts/', include('hc.accounts.urls')),
|
url(r'^accounts/', include('hc.accounts.urls')),
|
||||||
url(r'^', include('hc.api.urls')),
|
url(r'^', include('hc.api.urls')),
|
||||||
|
@ -15,8 +15,12 @@
|
|||||||
<h1>Health Checks</h1>
|
<h1>Health Checks</h1>
|
||||||
<div class="dialog-body">
|
<div class="dialog-body">
|
||||||
<p>
|
<p>
|
||||||
|
{% if show_password %}
|
||||||
|
Please entery your email address and password.
|
||||||
|
{% else %}
|
||||||
Please enter your email address.
|
Please enter your email address.
|
||||||
Next, we'll send you an email with log-in instructions!
|
Next, we'll send you an email with log-in instructions!
|
||||||
|
{% endif %}
|
||||||
</p>
|
</p>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
@ -43,7 +47,7 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{% if not bad_credentials %}
|
{% if not show_password %}
|
||||||
<div class="checkbox" id="password-toggle">
|
<div class="checkbox" id="password-toggle">
|
||||||
<label>
|
<label>
|
||||||
<input type="checkbox"> I want to use a password
|
<input type="checkbox"> I want to use a password
|
||||||
@ -52,7 +56,7 @@
|
|||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
|
|
||||||
<div id="password-block" class="form-group {% if not bad_credentials %} hide {% endif %}">
|
<div id="password-block" class="form-group {% if not show_password %} hide {% endif %}">
|
||||||
<div class="input-group input-group-lg">
|
<div class="input-group input-group-lg">
|
||||||
<div class="input-group-addon">
|
<div class="input-group-addon">
|
||||||
<span class="icon-dots"></span>
|
<span class="icon-dots"></span>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user