From e15d38c00fa715ebbfcc54249035fd0563c467cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bodor=20M=C3=A1t=C3=A9?= <bmate711@gmail.com> Date: Wed, 21 Feb 2018 13:32:42 +0100 Subject: [PATCH] rename base to common --- src/common/__init__.py | 0 src/{homework => common}/permissions.py | 13 +------------ src/homework/views.py | 2 +- src/news/permissions.py | 7 ------- src/news/views.py | 2 +- 5 files changed, 3 insertions(+), 21 deletions(-) create mode 100644 src/common/__init__.py rename src/{homework => common}/permissions.py (75%) delete mode 100644 src/news/permissions.py diff --git a/src/common/__init__.py b/src/common/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/src/homework/permissions.py b/src/common/permissions.py similarity index 75% rename from src/homework/permissions.py rename to src/common/permissions.py index 659c3a6..5aac2f0 100644 --- a/src/homework/permissions.py +++ b/src/common/permissions.py @@ -11,30 +11,19 @@ class IsStaffOrReadOnly(BasePermission): return request.method in SAFE_METHODS or request.user and request.user.is_staff -class IsAuthenticatedOrReadOnly(BasePermission): - """ - The request is authenticated as a user, or is a read-only request. - """ - - def has_permission(self, request, view): - return request.method in SAFE_METHODS or request.user and request.user.is_authenticated - - class IsStaffOrReadOnlyForAuthenticated(BasePermission): - """ The request is authenticated as a staff, or is a read-only request for authenticated. """ + def has_permission(self, request, view): return request.user.is_staff or request.method in SAFE_METHODS and request.user.is_authenticated class IsStaffUser(BasePermission): - """ The request is authenticated as a staff """ def has_permission(self, request, view): return request.user.is_staff - \ No newline at end of file diff --git a/src/homework/views.py b/src/homework/views.py index e4da4ef..498f447 100644 --- a/src/homework/views.py +++ b/src/homework/views.py @@ -7,7 +7,7 @@ from django.shortcuts import get_object_or_404 from . import serializers from . import models -from . import permissions +from common import permissions class TasksViewSet(viewsets.ModelViewSet): diff --git a/src/news/permissions.py b/src/news/permissions.py deleted file mode 100644 index 8eca896..0000000 --- a/src/news/permissions.py +++ /dev/null @@ -1,7 +0,0 @@ -from rest_framework.permissions import BasePermission -from rest_framework.permissions import SAFE_METHODS - - -class IsStaffOrReadOnly(BasePermission): - def has_permission(self, request, view): - return request.user.is_staff or request.method in SAFE_METHODS diff --git a/src/news/views.py b/src/news/views.py index e0305fa..7267fd8 100644 --- a/src/news/views.py +++ b/src/news/views.py @@ -1,4 +1,4 @@ -from news.permissions import IsStaffOrReadOnly +from common.permissions import IsStaffOrReadOnly from rest_framework import viewsets from news.models import Article from news.serializers import ArticleListSerializer -- GitLab