diff --git a/mayan/apps/documents/api.py b/mayan/apps/documents/api.py index c3726cf683..4db45e85fc 100644 --- a/mayan/apps/documents/api.py +++ b/mayan/apps/documents/api.py @@ -17,7 +17,7 @@ from permissions.models import Permission from .conf.settings import DISPLAY_SIZE, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL from .models import Document, DocumentVersion, DocumentPage from .permissions import PERMISSION_DOCUMENT_VIEW -from .resources import DocumentSerializer, DocumentVersionSerializer, DocumentPageSerializer +from .serializers import DocumentSerializer, DocumentVersionSerializer, DocumentPageSerializer logger = logging.getLogger(__name__) diff --git a/mayan/apps/documents/resources.py b/mayan/apps/documents/serializers.py similarity index 100% rename from mayan/apps/documents/resources.py rename to mayan/apps/documents/serializers.py diff --git a/mayan/apps/sources/api.py b/mayan/apps/sources/api.py index 78818aba37..914e2f4b34 100644 --- a/mayan/apps/sources/api.py +++ b/mayan/apps/sources/api.py @@ -12,12 +12,9 @@ from converter.exceptions import UnkownConvertError, UnknownFileFormat from converter.literals import DEFAULT_PAGE_NUMBER, DEFAULT_ROTATION, DEFAULT_ZOOM_LEVEL from documents.conf.settings import DISPLAY_SIZE, ZOOM_MAX_LEVEL, ZOOM_MIN_LEVEL -#from acls.models import AccessEntry -#from permissions.models import Permission from .classes import StagingFile -from .resources import SerializerStagingFolder, SerializerStagingFolderFile from .models import StagingFolder -#from .permissions import PERMISSION_DOCUMENT_VIEW +from .serializers import SerializerStagingFolder, SerializerStagingFolderFile logger = logging.getLogger(__name__) @@ -57,12 +54,6 @@ class APIStagingSourceFileImageView(generics.GenericAPIView): staging_folder = get_object_or_404(StagingFolder, pk=staging_folder_pk) staging_file = staging_folder.get_file(encoded_filename=filename) - #try: - # Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_VIEW]) - #except PermissionDenied: - # AccessEntry.objects.check_access(PERMISSION_DOCUMENT_VIEW, request.user, document) - # Permission.objects.check_permissions(request.user, [PERMISSION_DOCUMENT_CREATE, PERMISSION_DOCUMENT_NEW_VERSION]) - size = request.GET.get('size', DISPLAY_SIZE) page = int(request.GET.get('page', DEFAULT_PAGE_NUMBER)) diff --git a/mayan/apps/sources/registry.py b/mayan/apps/sources/registry.py index 2e4b6bdd54..8056fb1dda 100644 --- a/mayan/apps/sources/registry.py +++ b/mayan/apps/sources/registry.py @@ -4,11 +4,4 @@ from django.conf.urls import url from .cleanup import cleanup - cleanup_functions = [cleanup] - -#version_0_api_services = [ -# #{'urlpattern': url(r'^staging_file/(?P[0-9]+)/image/$', APIStagingSourceView.as_view(), name='staging-file-image'), 'description': 'Return a base64 image of the staging file', 'url': 'staging_file//image/?page=&zoom=&rotate='}, -# {'urlpattern': url(r'^staging_folder/(?P[0-9]+)/$', APIStagingSourceView.as_view(), name='staging-source-list'), 'description': '', 'url': 'staging_file//image/?page=&zoom=&rotate='}, -#] - diff --git a/mayan/apps/sources/resources.py b/mayan/apps/sources/serializers.py similarity index 100% rename from mayan/apps/sources/resources.py rename to mayan/apps/sources/serializers.py