Rename the resources.py module to serializers.py

This commit is contained in:
Roberto Rosario
2014-07-08 23:47:52 -04:00
parent 29eca11c50
commit a40fe3719b
5 changed files with 2 additions and 18 deletions

View File

@@ -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__)

View File

@@ -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))

View File

@@ -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<pk>[0-9]+)/image/$', APIStagingSourceView.as_view(), name='staging-file-image'), 'description': 'Return a base64 image of the staging file', 'url': 'staging_file/<staging file ID>/image/?page=<page number>&zoom=<zoom percent>&rotate=<rotation degrees>'},
# {'urlpattern': url(r'^staging_folder/(?P<pk>[0-9]+)/$', APIStagingSourceView.as_view(), name='staging-source-list'), 'description': '', 'url': 'staging_file/<staging file ID>/image/?page=<page number>&zoom=<zoom percent>&rotate=<rotation degrees>'},
#]