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

Fix decorators in members

Browse Source
This commit is contained in:
Jan Tuomi
2017-09-28 20:28:19 +03:00
parent 69d26deef9
commit 3901c21c67
4 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
members/views/applications.py
+11 -6
View File
@@ -1,5 +1,5 @@
from django.shortcuts import render from django.shortcuts import render
from django.contrib.auth.decorators import permission_required from django.contrib.auth.decorators import permission_required, login_required
from django.views.decorators.http import require_http_methods from django.views.decorators.http import require_http_methods
from django.views.decorators.csrf import ensure_csrf_cookie from django.views.decorators.csrf import ensure_csrf_cookie
from django.http import HttpResponse, HttpResponseRedirect from django.http import HttpResponse, HttpResponseRedirect
@@ -18,7 +18,8 @@ from members.forms import ApplicationForm
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.read_application', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.read_application', raise_exception=True)
def application_list(request, *args, **kwargs): def application_list(request, *args, **kwargs):
"""List member applications not yet processed.""" """List member applications not yet processed."""
applications = Request.objects.all() applications = Request.objects.all()
@@ -40,7 +41,8 @@ def application_list(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.change_request', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.change_request', raise_exception=True)
def application_edit(request, *args, **kwargs): def application_edit(request, *args, **kwargs):
"""Edit member request information.""" """Edit member request information."""
i = kwargs.pop('index', None) i = kwargs.pop('index', None)
@@ -58,7 +60,8 @@ def application_edit(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required('members.add_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.add_member', raise_exception=True)
def application_accept(request, *args, **kwargs): def application_accept(request, *args, **kwargs):
"""Accept application.""" """Accept application."""
form = ApplicationForm(request.POST) form = ApplicationForm(request.POST)
@@ -86,7 +89,8 @@ def application_accept(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required('members.delete_request', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.delete_request', raise_exception=True)
def application_delete(request, *args, **kwargs): def application_delete(request, *args, **kwargs):
"""Delete member application.""" """Delete member application."""
try: try:
@@ -114,7 +118,8 @@ def application_delete(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.delete_request', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.delete_request', raise_exception=True)
def application_delete_confirm(request, *args, **kwargs): def application_delete_confirm(request, *args, **kwargs):
"""Confirm application deletion.""" """Confirm application deletion."""
i = kwargs.pop('index', None) i = kwargs.pop('index', None)
members/views/members.py
+20 -10
View File
@@ -1,5 +1,5 @@
from django.shortcuts import render from django.shortcuts import render
from django.contrib.auth.decorators import permission_required from django.contrib.auth.decorators import permission_required, login_required
from django.utils.decorators import method_decorator from django.utils.decorators import method_decorator
from django.views.decorators.http import require_http_methods from django.views.decorators.http import require_http_methods
from django.views.decorators.csrf import ensure_csrf_cookie from django.views.decorators.csrf import ensure_csrf_cookie
@@ -27,7 +27,8 @@ from members.views.utils import *
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.read_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.read_member', raise_exception=True)
def member_list(request, *args, **kwargs): def member_list(request, *args, **kwargs):
"""Render members list.""" """Render members list."""
search = request.GET.get('q', None) search = request.GET.get('q', None)
@@ -53,7 +54,8 @@ def member_list(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.add_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.add_member', raise_exception=True)
def member_add(request, *args, **kwargs): def member_add(request, *args, **kwargs):
"""Render add member page.""" """Render add member page."""
form = MemberForm() form = MemberForm()
@@ -62,7 +64,8 @@ def member_add(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.delete_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.delete_member', raise_exception=True)
def member_delete_confirm(request, *args, **kwargs): def member_delete_confirm(request, *args, **kwargs):
"""Render member deletion confirmation page.""" """Render member deletion confirmation page."""
i = kwargs.pop('index', None) i = kwargs.pop('index', None)
@@ -78,7 +81,8 @@ def member_delete_confirm(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.add_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.add_member', raise_exception=True)
def member_add_many(request, *args, **kwargs): def member_add_many(request, *args, **kwargs):
"""Render add multiple members page.""" """Render add multiple members page."""
return render(request, 'member_add_many.html', {}) return render(request, 'member_add_many.html', {})
@@ -86,7 +90,8 @@ def member_add_many(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required('members.add_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.add_member', raise_exception=True)
def add_many_confirm(request, *args, **kwargs): def add_many_confirm(request, *args, **kwargs):
models = request.session['models'] models = request.session['models']
@@ -108,7 +113,8 @@ def add_many_confirm(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required('members.add_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.add_member', raise_exception=True)
def member_submit(request, *args, **kwargs): def member_submit(request, *args, **kwargs):
"""Add member based on data gained from member form.""" """Add member based on data gained from member form."""
form = MemberForm(request.POST) form = MemberForm(request.POST)
@@ -128,7 +134,8 @@ def member_submit(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required('members.change_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.change_member', raise_exception=True)
def member_update(request, *args, **kwargs): def member_update(request, *args, **kwargs):
"""Update member information.""" """Update member information."""
form = MemberForm(request.POST) form = MemberForm(request.POST)
@@ -154,7 +161,8 @@ def member_update(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required('members.delete_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.delete_member', raise_exception=True)
def member_delete(request, *args, **kwargs): def member_delete(request, *args, **kwargs):
"""Delete member.""" """Delete member."""
try: try:
@@ -181,7 +189,8 @@ def member_delete(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.change_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.change_member', raise_exception=True)
def member_edit(request, *args, **kwargs): def member_edit(request, *args, **kwargs):
"""Edit member information.""" """Edit member information."""
i = kwargs.pop('index', None) i = kwargs.pop('index', None)
@@ -197,6 +206,7 @@ def member_edit(request, *args, **kwargs):
class MemberAutoComplete(autocomplete.Select2QuerySetView): class MemberAutoComplete(autocomplete.Select2QuerySetView):
@method_decorator(login_required(login_url='/login'))
def get_queryset(self): def get_queryset(self):
qs = Member.objects.all() qs = Member.objects.all()
members/views/payments.py
+15 -8
View File
@@ -1,5 +1,5 @@
from django.shortcuts import render from django.shortcuts import render
from django.contrib.auth.decorators import permission_required from django.contrib.auth.decorators import permission_required, login_required
from django.views.decorators.http import require_http_methods from django.views.decorators.http import require_http_methods
from django.views.decorators.csrf import ensure_csrf_cookie from django.views.decorators.csrf import ensure_csrf_cookie
from django.http import HttpResponse, HttpResponseRedirect from django.http import HttpResponse, HttpResponseRedirect
@@ -18,7 +18,8 @@ from members.forms import PaymentForm
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.read_payment', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.read_payment', raise_exception=True)
def payment_list(request, *args, **kwargs): def payment_list(request, *args, **kwargs):
"""Render list of payments.""" """Render list of payments."""
search = request.GET.get('q', None) search = request.GET.get('q', None)
@@ -45,7 +46,8 @@ def payment_list(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.add_payment', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.add_payment', raise_exception=True)
def payment_add(request, *args, **kwargs): def payment_add(request, *args, **kwargs):
"""Render add payment form.""" """Render add payment form."""
form = PaymentForm() form = PaymentForm()
@@ -54,7 +56,8 @@ def payment_add(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required('members.add_payment', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.add_payment', raise_exception=True)
def payment_submit(request, *args, **kwargs): def payment_submit(request, *args, **kwargs):
"""Submit payment.""" """Submit payment."""
form = PaymentForm(request.POST) form = PaymentForm(request.POST)
@@ -75,7 +78,8 @@ def payment_submit(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.change_payment', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.change_payment', raise_exception=True)
def payment_edit(request, *args, **kwargs): def payment_edit(request, *args, **kwargs):
"""Edit payment.""" """Edit payment."""
i = kwargs.pop('index', None) i = kwargs.pop('index', None)
@@ -93,7 +97,8 @@ def payment_edit(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.delete_payment', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.delete_payment', raise_exception=True)
def payment_delete_confirm(request, *args, **kwargs): def payment_delete_confirm(request, *args, **kwargs):
"""Render payment delete confirmation page.""" """Render payment delete confirmation page."""
i = kwargs.pop('index', None) i = kwargs.pop('index', None)
@@ -111,7 +116,8 @@ def payment_delete_confirm(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required('members.delete_payment', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.delete_payment', raise_exception=True)
def payment_delete(request, *args, **kwargs): def payment_delete(request, *args, **kwargs):
"""Delete payment.""" """Delete payment."""
try: try:
@@ -139,7 +145,8 @@ def payment_delete(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required('members.change_payment', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.change_payment', raise_exception=True)
def payment_update(request, *args, **kwargs): def payment_update(request, *args, **kwargs):
"""Update payment information.""" """Update payment information."""
form = PaymentForm(request.POST) form = PaymentForm(request.POST)
members/views/utils.py
+5 -3
View File
@@ -1,5 +1,5 @@
from django.shortcuts import render from django.shortcuts import render
from django.contrib.auth.decorators import permission_required from django.contrib.auth.decorators import permission_required, login_required
from django.views.decorators.http import require_http_methods from django.views.decorators.http import require_http_methods
from django.views.decorators.csrf import ensure_csrf_cookie from django.views.decorators.csrf import ensure_csrf_cookie
from django.http import HttpResponse, HttpResponseRedirect from django.http import HttpResponse, HttpResponseRedirect
@@ -93,7 +93,8 @@ def convert_table_to_html(table, request):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["GET"]) @require_http_methods(["GET"])
@permission_required('members.change_member', login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required('members.change_member', raise_exception=True)
def settings_page(request, *args, **kwargs): def settings_page(request, *args, **kwargs):
"""Render member app settings page.""" """Render member app settings page."""
return render(request, 'settings.html', {}) return render(request, 'settings.html', {})
@@ -101,7 +102,8 @@ def settings_page(request, *args, **kwargs):
@ensure_csrf_cookie @ensure_csrf_cookie
@require_http_methods(["POST"]) @require_http_methods(["POST"])
@permission_required(['members.change_member', 'members.change_payment'], login_url='/login', raise_exception=True) @login_required(login_url='/login')
@permission_required(['members.change_member', 'members.change_payment'], raise_exception=True)
def import_csv(request, *args, **kwargs): def import_csv(request, *args, **kwargs):
"""Get csv data imported to page and create members based on that.""" """Get csv data imported to page and create members based on that."""
try: try: