matthias/mayan-edms
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add klass argument to get_object_or_404 usage

Browse Source 
Signed-off-by: Roberto Rosario <Roberto.Rosario@mayan-edms.com>
This commit is contained in:
Roberto Rosario
2018-12-16 01:55:33 -04:00
parent 727d2ecd71
commit 798446f362
39 changed files with 164 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mayan/apps/documents/api_views.py
View File

@@ -160,7 +160,7 @@ class APIDocumentPageImageView(generics.RetrieveAPIView):
else:
permission_required = permission_document_edit
document = get_object_or_404(Document.passthrough, pk=self.kwargs['pk'])
document = get_object_or_404(klass=Document.passthrough, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
permission_required, self.request.user, document
@@ -169,7 +169,7 @@ class APIDocumentPageImageView(generics.RetrieveAPIView):
def get_document_version(self):
return get_object_or_404(
self.get_document().versions.all(), pk=self.kwargs['version_pk']
klass=self.get_document().versions.all(), pk=self.kwargs['version_pk']
)
def get_queryset(self):
@@ -256,7 +256,7 @@ class APIDocumentPageView(generics.RetrieveUpdateAPIView):
else:
permission_required = permission_document_edit
document = get_object_or_404(Document, pk=self.kwargs['pk'])
document = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
permission_required, self.request.user, document
@@ -265,7 +265,7 @@ class APIDocumentPageView(generics.RetrieveUpdateAPIView):
def get_document_version(self):
return get_object_or_404(
self.get_document().versions.all(), pk=self.kwargs['version_pk']
klass=self.get_document().versions.all(), pk=self.kwargs['version_pk']
)
def get_queryset(self):
@@ -335,7 +335,7 @@ class APIDocumentTypeDocumentListView(generics.ListAPIView):
serializer_class = DocumentSerializer
def get_queryset(self):
document_type = get_object_or_404(DocumentType, pk=self.kwargs['pk'])
document_type = get_object_or_404(klass=DocumentType, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
permissions=permission_document_type_view, user=self.request.user,
obj=document_type
@@ -351,7 +351,7 @@ class APIDocumentVersionDownloadView(DownloadMixin, generics.RetrieveAPIView):
lookup_url_kwarg = 'version_pk'
def get_document(self):
document = get_object_or_404(Document, pk=self.kwargs['pk'])
document = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
permissions=(permission_document_download,), user=self.request.user,
@@ -445,7 +445,7 @@ class APIDocumentVersionPageListView(generics.ListAPIView):
serializer_class = DocumentPageSerializer
def get_document(self):
document = get_object_or_404(Document, pk=self.kwargs['pk'])
document = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
permission_document_view, self.request.user, document
@@ -454,7 +454,7 @@ class APIDocumentVersionPageListView(generics.ListAPIView):
def get_document_version(self):
return get_object_or_404(
self.get_document().versions.all(), pk=self.kwargs['version_pk']
klass=self.get_document().versions.all(), pk=self.kwargs['version_pk']
)
def get_queryset(self):
@@ -493,10 +493,10 @@ class APIDocumentVersionsListView(generics.ListCreateAPIView):
return NewDocumentVersionSerializer
def get_queryset(self):
return get_object_or_404(Document, pk=self.kwargs['pk']).versions.all()
return get_object_or_404(klass=Document, pk=self.kwargs['pk']).versions.all()
def perform_create(self, serializer):
document = get_object_or_404(Document, pk=self.kwargs['pk'])
document = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
permissions=(permission_document_new_version,),
@@ -522,7 +522,7 @@ class APIDocumentVersionView(generics.RetrieveUpdateDestroyAPIView):
else:
permission_required = permission_document_edit
document = get_object_or_404(Document, pk=self.kwargs['pk'])
document = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
permission_required, self.request.user, document

8
mayan/apps/documents/views/document_page_views.py
View File

@@ -49,7 +49,7 @@ class DocumentPageInteractiveTransformation(RedirectView):
)
def get_object(self):
return get_object_or_404(DocumentPage, pk=self.kwargs['pk'])
return get_object_or_404(klass=DocumentPage, pk=self.kwargs['pk'])
def get_redirect_url(self, *args, **kwargs):
url = reverse(
@@ -79,7 +79,7 @@ class DocumentPageListView(SingleObjectListView):
).dispatch(request, *args, **kwargs)
def get_document(self):
return get_object_or_404(Document, pk=self.kwargs['pk'])
return get_object_or_404(klass=Document, pk=self.kwargs['pk'])
def get_extra_context(self):
return {
@@ -107,7 +107,7 @@ class DocumentPageNavigationBase(RedirectView):
)
def get_object(self):
return get_object_or_404(DocumentPage, pk=self.kwargs['pk'])
return get_object_or_404(klass=DocumentPage, pk=self.kwargs['pk'])
def get_redirect_url(self, *args, **kwargs):
parse_result = urlparse(
@@ -251,7 +251,7 @@ class DocumentPageView(SimpleView):
}
def get_object(self):
return get_object_or_404(DocumentPage, pk=self.kwargs['pk'])
return get_object_or_404(klass=DocumentPage, pk=self.kwargs['pk'])
class DocumentPageViewResetView(RedirectView):

6
mayan/apps/documents/views/document_type_views.py
View File

@@ -71,7 +71,7 @@ class DocumentTypeDeleteView(SingleObjectDeleteView):
class DocumentTypeDocumentListView(DocumentListView):
def get_document_type(self):
return get_object_or_404(DocumentType, pk=self.kwargs['pk'])
return get_object_or_404(klass=DocumentType, pk=self.kwargs['pk'])
def get_document_queryset(self):
return self.get_document_type().documents.all()
@@ -145,7 +145,7 @@ class DocumentTypeFilenameCreateView(SingleObjectCreateView):
)
def get_document_type(self):
return get_object_or_404(DocumentType, pk=self.kwargs['pk'])
return get_object_or_404(klass=DocumentType, pk=self.kwargs['pk'])
def get_extra_context(self):
return {
@@ -218,7 +218,7 @@ class DocumentTypeFilenameListView(SingleObjectListView):
object_permission = permission_document_type_view
def get_document_type(self):
return get_object_or_404(DocumentType, pk=self.kwargs['pk'])
return get_object_or_404(klass=DocumentType, pk=self.kwargs['pk'])
def get_extra_context(self):
return {

4
mayan/apps/documents/views/document_version_views.py
View File

@@ -38,7 +38,7 @@ class DocumentVersionListView(SingleObjectListView):
).dispatch(request, *args, **kwargs)
def get_document(self):
return get_object_or_404(Document, pk=self.kwargs['pk'])
return get_object_or_404(klass=Document, pk=self.kwargs['pk'])
def get_extra_context(self):
return {
@@ -66,7 +66,7 @@ class DocumentVersionRevertView(ConfirmView):
}
def get_object(self):
return get_object_or_404(DocumentVersion, pk=self.kwargs['pk'])
return get_object_or_404(klass=DocumentVersion, pk=self.kwargs['pk'])
def view_action(self):
try:

12
mayan/apps/documents/views/document_views.py
View File

@@ -238,7 +238,7 @@ class DocumentDuplicatesListView(DocumentListView):
).dispatch(request, *args, **kwargs)
def get_document(self):
return get_object_or_404(Document, pk=self.kwargs['pk'])
return get_object_or_404(klass=Document, pk=self.kwargs['pk'])
def get_extra_context(self):
context = super(DocumentDuplicatesListView, self).get_extra_context()
@@ -327,7 +327,7 @@ class DocumentRestoreView(ConfirmView):
def object_action(self, instance):
source_document = get_object_or_404(
Document.passthrough, pk=instance.pk
klass=Document.passthrough, pk=instance.pk
)
AccessControlList.objects.check_access(
@@ -338,7 +338,7 @@ class DocumentRestoreView(ConfirmView):
instance.restore()
def view_action(self):
instance = get_object_or_404(DeletedDocument, pk=self.kwargs['pk'])
instance = get_object_or_404(klass=DeletedDocument, pk=self.kwargs['pk'])
self.object_action(instance=instance)
@@ -366,7 +366,7 @@ class DocumentTrashView(ConfirmView):
}
def get_object(self):
return get_object_or_404(Document, pk=self.kwargs['pk'])
return get_object_or_404(klass=Document, pk=self.kwargs['pk'])
def get_post_action_redirect(self):
return reverse('documents:document_list_recent_access')
@@ -752,7 +752,7 @@ class DocumentTransformationsCloneView(FormView):
return context
def get_object(self):
instance = get_object_or_404(Document, pk=self.kwargs['pk'])
instance = get_object_or_404(klass=Document, pk=self.kwargs['pk'])
AccessControlList.objects.check_access(
permissions=permission_transformation_edit,
@@ -825,7 +825,7 @@ class DocumentPrint(FormView):
return context
def get_object(self):
return get_object_or_404(Document, pk=self.kwargs['pk'])
return get_object_or_404(klass=Document, pk=self.kwargs['pk'])
def get_template_names(self):
if self.page_group or self.page_range: