From 285a0e7dbf7634febce11e9bdbc2374f28f3ec99 Mon Sep 17 00:00:00 2001 From: Jan Tuomi Date: Thu, 28 Sep 2017 20:29:54 +0300 Subject: [PATCH] Fix decorators in webapp --- webapp/views.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/webapp/views.py b/webapp/views.py index d398898..3aac545 100644 --- a/webapp/views.py +++ b/webapp/views.py @@ -5,7 +5,7 @@ from django.contrib.auth import login, logout, authenticate from django.views.decorators.http import require_http_methods from django.views.decorators.csrf import ensure_csrf_cookie from django.http import HttpResponse, HttpResponseRedirect -from django.contrib.auth.decorators import permission_required +from django.contrib.auth.decorators import permission_required, login_required from django.conf import settings import logging from webapp.models import OhlhafvChallenge @@ -21,7 +21,8 @@ def main_index(request, *args, **kwargs): @require_http_methods(["GET", "POST"]) @ensure_csrf_cookie -@permission_required('members.change_member', login_url='/login') +@login_required(login_url='/login') +@permission_required('members.change_member') def admin_index(request, *args, **kwargs): """Render admin main page.""" return render(request, "admin_index.html", {}) @@ -50,7 +51,7 @@ def login_view(request, *args, **kwargs): return render(request, "login.html", {}) -@require_http_methods(["POST"]) +@require_http_methods(["GET", "POST"]) def logout_view(request, *args, **kwargs): """Logout user and return to main page.""" logout(request)