Merge branch 'master' into server

schoolapps/aub/decorators.py

@@ -3,10 +3,12 @@ from django.contrib.auth import REDIRECT_FIELD_NAME
 
 from .models import Aub, Status
 
+
 # prevent to show aub details from foreign users
 def check_own_aub_verification(user):
     return Aub.objects.all().filter(created_by=user)
 
+
 def check_own_aub(function=None, redirect_field_name=REDIRECT_FIELD_NAME, login_url=None):
     """
     Decorator for views that checks that the user only gets his own aub, redirecting
@@ -19,4 +21,4 @@ def check_own_aub(function=None, redirect_field_name=REDIRECT_FIELD_NAME, login_
     )
     if function:
         return actual_decorator(function)
-    return actual_decorator
\ No newline at end of file
+    return actual_decorator

schoolapps/aub/views.py

@@ -44,7 +44,7 @@ def index(request):
 
 @login_required
 @permission_required('aub.apply_for_aub')
-@check_own_aub(login_url='/index.html')
+@check_own_aub(login_url='/')
 def details(request, id):
     aub = get_object_or_404(Aub, id=id)
     context = {

schoolapps/debug/views.py

-from django.contrib.auth.decorators import login_required
+from django.contrib.auth.decorators import login_required, permission_required
 from django.shortcuts import render
 
 from debug.models import DebugLogGroup
 
 
 @login_required
-# @permission_required("timetable.")
+@permission_required("debug.can_view_debug_log")
 def debugging_tool(request):
     groups = DebugLogGroup.objects.all()
     return render(request, "debug/debug.html", {"groups": groups})