From 11b6e68fe141179c123d875172e17d22dc7bd909 Mon Sep 17 00:00:00 2001 From: Aarni Halinen Date: Tue, 17 Jul 2018 20:58:13 +0300 Subject: [PATCH] Remove password_reset and own login, redirect to admin/login Django admin login to be used. Thus we should be able to upgrade to Django2.0 --- infoscreen/templates/infoscreen_admin.html | 2 +- infoscreen/views/admin_views.py | 16 +++++------ members/templates/base.html | 2 +- members/urls.py | 2 +- members/views/applications.py | 12 ++++----- members/views/members.py | 18 ++++++------- members/views/payments.py | 14 +++++----- members/views/utils.py | 4 +-- requirements.txt | 6 +---- sikweb/base.py | 1 - sikweb/urls.py | 2 -- templates/login.html | 30 --------------------- templates/password_reset/base.html | 1 - templates/password_reset/recovery_done.html | 8 ------ templates/password_reset/recovery_form.html | 12 --------- templates/password_reset/reset.html | 14 ---------- templates/password_reset/reset_mail.html | 15 ----------- templates/password_reset/reset_sent.html | 8 ------ webapp/urls.py | 8 +++--- webapp/views.py | 30 --------------------- 20 files changed, 40 insertions(+), 165 deletions(-) delete mode 100644 templates/login.html delete mode 100644 templates/password_reset/base.html delete mode 100644 templates/password_reset/recovery_done.html delete mode 100644 templates/password_reset/recovery_form.html delete mode 100644 templates/password_reset/reset.html delete mode 100644 templates/password_reset/reset_mail.html delete mode 100644 templates/password_reset/reset_sent.html diff --git a/infoscreen/templates/infoscreen_admin.html b/infoscreen/templates/infoscreen_admin.html index c7fb503..47d3258 100644 --- a/infoscreen/templates/infoscreen_admin.html +++ b/infoscreen/templates/infoscreen_admin.html @@ -22,7 +22,7 @@ {% block body %} -{% endblock content %} diff --git a/templates/password_reset/base.html b/templates/password_reset/base.html deleted file mode 100644 index d6c32ad..0000000 --- a/templates/password_reset/base.html +++ /dev/null @@ -1 +0,0 @@ -{% extends "login.html" %} \ No newline at end of file diff --git a/templates/password_reset/recovery_done.html b/templates/password_reset/recovery_done.html deleted file mode 100644 index 164b8ff..0000000 --- a/templates/password_reset/recovery_done.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "password_reset/base.html" %}{% load i18n %} - -{% block title %}{% trans "New password set" %}{% endblock %} - -{% block content %} -

{% trans "Your password has successfully been reset. You can use it right now on the login page." %}

-

Log in

-{% endblock %} \ No newline at end of file diff --git a/templates/password_reset/recovery_form.html b/templates/password_reset/recovery_form.html deleted file mode 100644 index ae8f7c2..0000000 --- a/templates/password_reset/recovery_form.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "password_reset/base.html" %} -{% load i18n %} -{% load bootstrap3 %} - -{% block content %} -

{% trans "Password recovery" %}

-
- {% csrf_token %} - {% bootstrap_form form %} -

-
-{% endblock %} \ No newline at end of file diff --git a/templates/password_reset/reset.html b/templates/password_reset/reset.html deleted file mode 100644 index ab1cd5c..0000000 --- a/templates/password_reset/reset.html +++ /dev/null @@ -1,14 +0,0 @@ -{% extends "password_reset/base.html" %}{% load i18n %} - -{% block content %} - {% if invalid %}{% url "password_reset_recover" as recovery_url %} -

{% blocktrans %}Sorry, this password reset link is invalid. You can still request a new one.{% endblocktrans %}

- {% else %} -

{% blocktrans %}Hi, {{ username }}. Please choose your new password.{% endblocktrans %}

-
- {% csrf_token %} - {{ form.as_p }} -

-
- {% endif %} -{% endblock %} \ No newline at end of file diff --git a/templates/password_reset/reset_mail.html b/templates/password_reset/reset_mail.html deleted file mode 100644 index c1ef31f..0000000 --- a/templates/password_reset/reset_mail.html +++ /dev/null @@ -1,15 +0,0 @@ -{% autoescape off %} -You're receiving this e-mail because you requested a password reset for your user account at {{ site_name }}. - -Please go to the following page and choose a new password: -{% block reset_link %} -{{ protocol }}://{{ domain }}{% url django.contrib.auth.views.password_reset_confirm uidb36=uid, token=token %} -{% endblock %} - -Your username, in case you've forgotten: {{ user.username }} - -Thanks for using our site! - -The {{ site_name }} team. - -{% endautoescape %} \ No newline at end of file diff --git a/templates/password_reset/reset_sent.html b/templates/password_reset/reset_sent.html deleted file mode 100644 index 15d12d7..0000000 --- a/templates/password_reset/reset_sent.html +++ /dev/null @@ -1,8 +0,0 @@ -{% extends "password_reset/base.html" %} -{% load i18n %} - -{% block title %}{% trans "Password recovery sent" %}{% endblock %} - -{% block content %} -

{% blocktrans with ago=timestamp|timesince %}An email was sent to {{ email }} {{ ago }} ago. Use the link in it to set a new password.{% endblocktrans %}

-{% endblock %} \ No newline at end of file diff --git a/webapp/urls.py b/webapp/urls.py index dfd12a9..4f5d6e1 100644 --- a/webapp/urls.py +++ b/webapp/urls.py @@ -7,8 +7,8 @@ from rest_framework import routers # from django.utils.translation import ugettext_lazy as _ # from webapp.views import main_index -from webapp.views import login_view -from webapp.views import logout_view +# from webapp.views import login_view +# from webapp.views import logout_view # from webapp.views import about_view # from webapp.views import guild_view # from webapp.views import freshmen_view @@ -28,8 +28,8 @@ router.register(r'signup', SignupViewSet) urlpatterns = [ url(r'^', include(router.urls)), # login stuff - url(r'^login$', login_view), - url(r'^logout$', logout_view), + # url(r'^login$', login_view), + # url(r'^logout$', logout_view), ] # urlpatterns = [ # # main diff --git a/webapp/views.py b/webapp/views.py index 74dfd78..e538647 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -54,36 +54,6 @@ def main_index(request, *args, **kwargs): return render(request, "index.html", {}) -@require_http_methods(["GET", "POST"]) -def login_view(request, *args, **kwargs): - """Render login view.""" - if request.method == "POST": - uname = request.POST.get("username", None) - pw = request.POST.get("passwd", None) - user = authenticate(username=uname, password=pw) - if user is not None: - login(request, user) - original_site = request.GET.get("next", None) or "/" - return redirect(original_site) - return render(request, - "login.html", - {"error": "☹ Kirjautuminen kosahti. Yritä uudelleen!"}) - - # user got here by a get request - user = request.user - if user.is_authenticated: - # user shoud not be here authenticated with get but get rid if is - return redirect("/") - return render(request, "login.html", {}) - - -@require_http_methods(["GET", "POST"]) -def logout_view(request, *args, **kwargs): - """Logout user and return to main page.""" - logout(request) - return redirect("/") - - @require_http_methods(["GET"]) def about_view(request, *args, **kwargs): """Render about page."""