[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] [taler-bank] branch master updated: Adapt to latest Django
From: |
gnunet |
Subject: |
[GNUnet-SVN] [taler-bank] branch master updated: Adapt to latest Django changes. |
Date: |
Fri, 05 Oct 2018 16:29:21 +0200 |
This is an automated email from the git hooks/post-receive script.
marcello pushed a commit to branch master
in repository bank.
The following commit(s) were added to refs/heads/master by this push:
new 8e11fbb Adapt to latest Django changes.
8e11fbb is described below
commit 8e11fbb283192afc7edeb9864b4eafded42ac348
Author: Marcello Stanisci <address@hidden>
AuthorDate: Fri Oct 5 16:29:02 2018 +0200
Adapt to latest Django changes.
---
talerbank/app/templates/login.html | 19 -------------------
talerbank/app/urls.py | 7 ++++++-
talerbank/app/views.py | 13 -------------
3 files changed, 6 insertions(+), 33 deletions(-)
diff --git a/talerbank/app/templates/login.html
b/talerbank/app/templates/login.html
index 40a5a5b..4e0d7eb 100644
--- a/talerbank/app/templates/login.html
+++ b/talerbank/app/templates/login.html
@@ -27,25 +27,6 @@
<article>
<div class="login-form">
<h2>Please login!</h2>
- {% if fail_message %}
- <p class="informational informational-fail">
- {{ hint }}
- </p>
- {% endif %}
- {% if success_message %}
- <p class="informational informational-ok">
- {{ hint }}
- </p>
- {% endif %}
-
- {% if next %}
- {% if user.is_authenticated %}
- <p class="informational informational-fail">Your account doesn't
have access to this page. To proceed,
- please login with an account that has access.</p>
- {% else %}
- <p>Please login to see this page.</p>
- {% endif %}
- {% endif %}
<form method="post" class="pure-form" action="{{ url('login') }}">
<input type="hidden" name="csrfmiddlewaretoken" value="{{ csrf_token
}}" />
{{ form.username }}
diff --git a/talerbank/app/urls.py b/talerbank/app/urls.py
index 19c0169..c4a543c 100644
--- a/talerbank/app/urls.py
+++ b/talerbank/app/urls.py
@@ -19,6 +19,7 @@
from django.conf.urls import include, url
from django.views.generic.base import RedirectView
+from django.contrib.auth import views as auth_views
from . import views
urlpatterns = [
@@ -28,7 +29,11 @@ urlpatterns = [
url(r'^favicon\.ico$', views.ignore),
url(r'^admin/add/incoming$', views.add_incoming,
name="add-incoming"),
- url(r'^login/$', views.login_view, name="login"),
+ url(r'^login/$',
+ auth_views.LoginView.as_view(
+ template_name="login.html",
+ authentication_form=views.TalerAuthenticationForm),
+ name="login"),
url(r'^logout/$', views.logout_view, name="logout"),
url(r'^accounts/register/$', views.register, name="register"),
url(r'^profile$', views.profile_page, name="profile"),
diff --git a/talerbank/app/views.py b/talerbank/app/views.py
index c24dd0f..3e57cf2 100644
--- a/talerbank/app/views.py
+++ b/talerbank/app/views.py
@@ -77,19 +77,6 @@ def ignore(request):
del request
return HttpResponse()
-def login_view(request):
- fail_message, success_message, hint = get_session_hint(request,
"login_hint")
- response = django.contrib.auth.views.login(
- request,
- authentication_form=TalerAuthenticationForm,
- template_name="login.html",
- extra_context={"user": request.user})
- if hasattr(response, "context_data"):
- response.context_data["fail_message"] = fail_message
- response.context_data["success_message"] = success_message
- response.context_data["hint"] = hint
- return response
-
def get_session_flag(request, name):
"""
Get a flag from the session and clear it.
--
To stop receiving notification emails like this one, please contact
address@hidden
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] [taler-bank] branch master updated: Adapt to latest Django changes.,
gnunet <=