TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove password_reset and own login, redirect to admin/login

Browse Source 
Django admin login to be used. Thus we should be able to upgrade to
Django2.0
This commit is contained in:
Aarni Halinen
2018-07-17 20:58:13 +03:00
parent cc3aa66e49
commit 11b6e68fe1
20 changed files with 40 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
members/templates/base.html
+1 -1
View File
@@ -75,7 +75,7 @@
<li><a href="/members/settings">{% trans "Settings" %}</a></li>
</ul>
<form action="/logout" method="post"> {% csrf_token %}
<form action="/admin/logout/" method="post"> {% csrf_token %}
<input type="Submit" value="{% trans "Log out" %}" name="Logout" class="btn btn-danger"/>
</form>
</li>
members/urls.py
+1 -1
View File
@@ -46,7 +46,7 @@ favicon_view = RedirectView.as_view(
url='static/img/favicon.ico', permanent=True)
member_autocomplete_view = login_required(
permission_required('members.change_member', login_url='/login')(MemberAutoComplete.as_view())
permission_required('members.change_member', login_url='/admin/login')
)
urlpatterns = [
members/views/applications.py
+6 -6
View File
@@ -19,7 +19,7 @@ from members.views import error_view
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.read_application', raise_exception=True)
def application_list(request, *args, **kwargs):
"""List member applications not yet processed."""
@@ -42,7 +42,7 @@ def application_list(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.change_request', raise_exception=True)
def application_edit(request, *args, **kwargs):
"""Edit member request information."""
@@ -60,7 +60,7 @@ def application_edit(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.add_member', raise_exception=True)
def application_accept(request, *args, **kwargs):
"""Accept application."""
@@ -102,7 +102,7 @@ def application_accept(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.delete_request', raise_exception=True)
def application_delete(request, *args, **kwargs):
"""Delete member application."""
@@ -128,7 +128,7 @@ def application_delete(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.delete_request', raise_exception=True)
def application_delete_confirm(request, *args, **kwargs):
"""Confirm application deletion."""
@@ -152,7 +152,7 @@ def application_form(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.delete_request', raise_exception=True)
def application_submit(request, *args, **kwargs):
"""Submit member application"""
members/views/members.py
+9 -9
View File
@@ -30,7 +30,7 @@ from members.views.utils import *
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.read_member', raise_exception=True)
def member_list(request, *args, **kwargs):
"""Render members list."""
@@ -68,7 +68,7 @@ def member_list(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.add_member', raise_exception=True)
def member_add(request, *args, **kwargs):
"""Render add member page."""
@@ -78,7 +78,7 @@ def member_add(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.delete_member', raise_exception=True)
def member_delete_confirm(request, *args, **kwargs):
"""Render member deletion confirmation page."""
@@ -94,7 +94,7 @@ def member_delete_confirm(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.add_member', raise_exception=True)
def member_add_many(request, *args, **kwargs):
"""Render add multiple members page."""
@@ -103,7 +103,7 @@ def member_add_many(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.add_member', raise_exception=True)
def add_many_confirm(request, *args, **kwargs):
models = request.session['models']
@@ -130,7 +130,7 @@ def add_many_confirm(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.add_member', raise_exception=True)
def member_submit(request, *args, **kwargs):
"""Add member based on data gained from member form."""
@@ -151,7 +151,7 @@ def member_submit(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.change_member', raise_exception=True)
def member_update(request, *args, **kwargs):
"""Update member information."""
@@ -179,7 +179,7 @@ def member_update(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.delete_member', raise_exception=True)
def member_delete(request, *args, **kwargs):
"""Delete member."""
@@ -204,7 +204,7 @@ def member_delete(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.change_member', raise_exception=True)
def member_edit(request, *args, **kwargs):
"""Edit member information."""
members/views/payments.py
+7 -7
View File
@@ -19,7 +19,7 @@ from members.views import error_view
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.read_payment', raise_exception=True)
def payment_list(request, *args, **kwargs):
"""Render list of payments."""
@@ -47,7 +47,7 @@ def payment_list(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.add_payment', raise_exception=True)
def payment_add(request, *args, **kwargs):
"""Render add payment form."""
@@ -57,7 +57,7 @@ def payment_add(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.add_payment', raise_exception=True)
def payment_submit(request, *args, **kwargs):
"""Submit payment."""
@@ -79,7 +79,7 @@ def payment_submit(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.change_payment', raise_exception=True)
def payment_edit(request, *args, **kwargs):
"""Edit payment."""
@@ -96,7 +96,7 @@ def payment_edit(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.delete_payment', raise_exception=True)
def payment_delete_confirm(request, *args, **kwargs):
"""Render payment delete confirmation page."""
@@ -113,7 +113,7 @@ def payment_delete_confirm(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.delete_payment', raise_exception=True)
def payment_delete(request, *args, **kwargs):
"""Delete payment."""
@@ -138,7 +138,7 @@ def payment_delete(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.change_payment', raise_exception=True)
def payment_update(request, *args, **kwargs):
"""Update payment information."""
members/views/utils.py
+2 -2
View File
@@ -95,7 +95,7 @@ def convert_table_to_html(table, request):
@ensure_csrf_cookie
@require_http_methods(["GET"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required('members.change_member', raise_exception=True)
def settings_page(request, *args, **kwargs):
"""Render member app settings page."""
@@ -104,7 +104,7 @@ def settings_page(request, *args, **kwargs):
@ensure_csrf_cookie
@require_http_methods(["POST"])
@login_required(login_url='/login')
@login_required(login_url='/admin/login')
@permission_required(['members.change_member', 'members.change_payment'], raise_exception=True)
def import_csv(request, *args, **kwargs):
"""Get csv data imported to page and create members based on that."""