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

Add keyword arguments to get_object_or_404 uses

Browse Source 
Signed-off-by: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
This commit is contained in:
Roberto Rosario
2019-04-11 20:53:33 -04:00
parent 456c322c19
commit f6f9287e33
38 changed files with 169 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -39,7 +39,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 {
@@ -67,7 +67,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(
@@ -197,7 +197,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):
@@ -218,7 +218,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(

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

@@ -33,7 +33,7 @@ logger = logging.getLogger(__name__)
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()
@@ -140,7 +140,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 {
@@ -213,7 +213,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:

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

@@ -111,7 +111,7 @@ class DeletedDocumentDeleteView(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(
@@ -124,7 +124,9 @@ class DeletedDocumentDeleteView(ConfirmView):
)
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)
messages.success(
self.request, _('Document: %(document)s deleted.') % {
@@ -237,7 +239,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()
@@ -326,7 +328,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(
@@ -337,7 +339,9 @@ 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)
@@ -365,7 +369,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')
@@ -751,7 +755,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,
@@ -824,7 +828,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: