Merge branch 'dev' into 'master'

Dev

See merge request lilcity/backend!31

api/v1/permissions.py

@@ -15,9 +15,9 @@ class IsAdmin(BasePermission):
 class IsTeacherOrAdmin(BasePermission):
     def has_permission(self, request, view):
         return request.user.is_authenticated and (
-            request.user.role in [
-                User.TEACHER_ROLE, User.ADMIN_ROLE
-            ] or request.user.is_staff or request.user.is_superuser
+            request.user.role > User.TEACHER_ROLE or
+            request.user.is_staff or
+            request.user.is_superuser
         )
 
 
@@ -31,9 +31,9 @@ class IsAdminOrIsSelf(BasePermission):
 class IsAuthorOrAdmin(BasePermission):
     def has_permission(self, request, view):
         return request.user.is_authenticated and (
-            request.user.role in [
-                User.AUTHOR_ROLE, User.ADMIN_ROLE
-            ] or request.user.is_staff or request.user.is_superuser
+            request.user.role >= User.AUTHOR_ROLE or
+            request.user.is_staff or
+            request.user.is_superuser
         )