diff --git a/mayan/apps/acls/api_views.py b/mayan/apps/acls/api_views.py index 13c07b7299..5c3612a9cb 100644 --- a/mayan/apps/acls/api_views.py +++ b/mayan/apps/acls/api_views.py @@ -21,12 +21,12 @@ class APIObjectACLListView(generics.ListCreateAPIView): """ def get_content_object(self): content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) content_object = get_object_or_404( - content_type.model_class(), pk=self.kwargs['object_pk'] + klass=content_type.model_class(), pk=self.kwargs['object_pk'] ) if self.request.method == 'GET': @@ -85,12 +85,12 @@ class APIObjectACLView(generics.RetrieveDestroyAPIView): permission_required = permission_acl_edit content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) content_object = get_object_or_404( - content_type.model_class(), pk=self.kwargs['object_pk'] + klass=content_type.model_class(), pk=self.kwargs['object_pk'] ) AccessControlList.objects.check_access( @@ -111,17 +111,17 @@ class APIObjectACLPermissionListView(generics.ListCreateAPIView): """ def get_acl(self): return get_object_or_404( - self.get_content_object().acls, pk=self.kwargs['pk'] + klass=self.get_content_object().acls, pk=self.kwargs['pk'] ) def get_content_object(self): content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) content_object = get_object_or_404( - content_type.model_class(), pk=self.kwargs['object_pk'] + klass=content_type.model_class(), pk=self.kwargs['object_pk'] ) AccessControlList.objects.check_access( @@ -168,17 +168,17 @@ class APIObjectACLPermissionView(generics.RetrieveDestroyAPIView): def get_acl(self): return get_object_or_404( - self.get_content_object().acls, pk=self.kwargs['pk'] + klass=self.get_content_object().acls, pk=self.kwargs['pk'] ) def get_content_object(self): content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) content_object = get_object_or_404( - content_type.model_class(), pk=self.kwargs['object_pk'] + klass=content_type.model_class(), pk=self.kwargs['object_pk'] ) AccessControlList.objects.check_access( diff --git a/mayan/apps/acls/views.py b/mayan/apps/acls/views.py index 79d1b496fb..241217eb24 100644 --- a/mayan/apps/acls/views.py +++ b/mayan/apps/acls/views.py @@ -33,7 +33,7 @@ class ACLCreateView(SingleObjectCreateView): def dispatch(self, request, *args, **kwargs): self.object_content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) @@ -89,7 +89,7 @@ class ACLDeleteView(SingleObjectDeleteView): model = AccessControlList def dispatch(self, request, *args, **kwargs): - acl = get_object_or_404(AccessControlList, pk=self.kwargs['pk']) + acl = get_object_or_404(klass=AccessControlList, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_acl_edit, user=request.user, @@ -117,7 +117,7 @@ class ACLDeleteView(SingleObjectDeleteView): class ACLListView(SingleObjectListView): def dispatch(self, request, *args, **kwargs): self.object_content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) @@ -189,11 +189,11 @@ class ACLPermissionsView(AssignRemoveView): return results def add(self, item): - permission = get_object_or_404(StoredPermission, pk=item) + permission = get_object_or_404(klass=StoredPermission, pk=item) self.get_object().permissions.add(permission) def dispatch(self, request, *args, **kwargs): - acl = get_object_or_404(AccessControlList, pk=self.kwargs['pk']) + acl = get_object_or_404(klass=AccessControlList, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_acl_edit, user=request.user, @@ -242,7 +242,7 @@ class ACLPermissionsView(AssignRemoveView): return StoredPermission.objects.filter(pk__in=merged_pks) def get_object(self): - return get_object_or_404(AccessControlList, pk=self.kwargs['pk']) + return get_object_or_404(klass=AccessControlList, pk=self.kwargs['pk']) def get_right_list_help_text(self): if self.get_object().get_inherited_permissions(): @@ -257,7 +257,7 @@ class ACLPermissionsView(AssignRemoveView): return ACLPermissionsView.generate_choices(self.get_available_list()) def remove(self, item): - permission = get_object_or_404(StoredPermission, pk=item) + permission = get_object_or_404(klass=StoredPermission, pk=item) self.get_object().permissions.remove(permission) def right_list(self): diff --git a/mayan/apps/cabinets/api_views.py b/mayan/apps/cabinets/api_views.py index 99f8ceb45b..65ac40d791 100644 --- a/mayan/apps/cabinets/api_views.py +++ b/mayan/apps/cabinets/api_views.py @@ -33,7 +33,7 @@ class APIDocumentCabinetListView(generics.ListAPIView): mayan_object_permissions = {'GET': (permission_cabinet_view,)} def get_queryset(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_view, user=self.request.user, obj=document @@ -135,7 +135,7 @@ class APICabinetDocumentListView(generics.ListCreateAPIView): return context def get_cabinet(self): - return get_object_or_404(Cabinet, pk=self.kwargs['pk']) + return get_object_or_404(klass=Cabinet, pk=self.kwargs['pk']) def get_queryset(self): cabinet = self.get_cabinet() @@ -163,7 +163,7 @@ class APICabinetDocumentView(generics.RetrieveDestroyAPIView): serializer_class = CabinetDocumentSerializer def get_cabinet(self): - return get_object_or_404(Cabinet, pk=self.kwargs['pk']) + return get_object_or_404(klass=Cabinet, pk=self.kwargs['pk']) def get_queryset(self): return self.get_cabinet().documents.all() diff --git a/mayan/apps/cabinets/views.py b/mayan/apps/cabinets/views.py index 53f44ca1cc..8e142a7aa5 100644 --- a/mayan/apps/cabinets/views.py +++ b/mayan/apps/cabinets/views.py @@ -133,7 +133,7 @@ class CabinetDetailView(DocumentListView): return context def get_object(self): - cabinet = get_object_or_404(Cabinet, pk=self.kwargs['pk']) + cabinet = get_object_or_404(klass=Cabinet, pk=self.kwargs['pk']) if cabinet.is_root_node(): permission_object = cabinet @@ -188,7 +188,7 @@ class CabinetListView(SingleObjectListView): class DocumentCabinetListView(CabinetListView): def dispatch(self, request, *args, **kwargs): - self.document = get_object_or_404(Document, pk=self.kwargs['pk']) + self.document = get_object_or_404(klass=Document, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_document_view, user=request.user, diff --git a/mayan/apps/checkouts/views.py b/mayan/apps/checkouts/views.py index 8a4c751d64..c58f42444b 100644 --- a/mayan/apps/checkouts/views.py +++ b/mayan/apps/checkouts/views.py @@ -28,7 +28,7 @@ class CheckoutDocumentView(SingleObjectCreateView): form_class = DocumentCheckoutForm def dispatch(self, request, *args, **kwargs): - self.document = get_object_or_404(Document, pk=self.kwargs['pk']) + self.document = get_object_or_404(klass=Document, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_document_check_out, user=request.user, @@ -124,7 +124,7 @@ class CheckoutDetailView(SingleObjectDetailView): } 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']) class DocumentCheckinView(ConfirmView): @@ -146,7 +146,7 @@ class DocumentCheckinView(ConfirmView): 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_post_action_redirect(self): return reverse('checkouts:check_out_info', args=(self.get_object().pk,)) diff --git a/mayan/apps/converter/views.py b/mayan/apps/converter/views.py index d1ec08c0a7..1ba13ecd9a 100644 --- a/mayan/apps/converter/views.py +++ b/mayan/apps/converter/views.py @@ -32,7 +32,7 @@ class TransformationDeleteView(SingleObjectDeleteView): def dispatch(self, request, *args, **kwargs): self.transformation = get_object_or_404( - Transformation, pk=self.kwargs['pk'] + klass=Transformation, pk=self.kwargs['pk'] ) AccessControlList.objects.check_access( @@ -80,7 +80,7 @@ class TransformationCreateView(SingleObjectCreateView): def dispatch(self, request, *args, **kwargs): content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) @@ -139,7 +139,7 @@ class TransformationEditView(SingleObjectEditView): def dispatch(self, request, *args, **kwargs): self.transformation = get_object_or_404( - Transformation, pk=self.kwargs['pk'] + klass=Transformation, pk=self.kwargs['pk'] ) AccessControlList.objects.check_access( @@ -188,7 +188,7 @@ class TransformationEditView(SingleObjectEditView): class TransformationListView(SingleObjectListView): def dispatch(self, request, *args, **kwargs): content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) diff --git a/mayan/apps/document_comments/api_views.py b/mayan/apps/document_comments/api_views.py index af7bec614f..04ea5b0897 100644 --- a/mayan/apps/document_comments/api_views.py +++ b/mayan/apps/document_comments/api_views.py @@ -25,7 +25,9 @@ class APICommentListView(generics.ListCreateAPIView): else: permission_required = permission_comment_create - document = get_object_or_404(Document, pk=self.kwargs['document_pk']) + document = get_object_or_404( + klass=Document, pk=self.kwargs['document_pk'] + ) AccessControlList.objects.check_access( permissions=permission_required, user=self.request.user, @@ -78,7 +80,9 @@ class APICommentView(generics.RetrieveDestroyAPIView): else: permission_required = permission_comment_delete - document = get_object_or_404(Document, pk=self.kwargs['document_pk']) + document = get_object_or_404( + klass=Document, pk=self.kwargs['document_pk'] + ) AccessControlList.objects.check_access( permissions=permission_required, user=self.request.user, diff --git a/mayan/apps/document_comments/views.py b/mayan/apps/document_comments/views.py index 018bdfe0f6..ec69239f3d 100644 --- a/mayan/apps/document_comments/views.py +++ b/mayan/apps/document_comments/views.py @@ -35,7 +35,7 @@ class DocumentCommentCreateView(SingleObjectCreateView): ).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 { @@ -90,7 +90,7 @@ class DocumentCommentDeleteView(SingleObjectDeleteView): class DocumentCommentListView(SingleObjectListView): 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 { diff --git a/mayan/apps/document_indexing/api_views.py b/mayan/apps/document_indexing/api_views.py index cf0b41487a..095a1bdd23 100644 --- a/mayan/apps/document_indexing/api_views.py +++ b/mayan/apps/document_indexing/api_views.py @@ -63,7 +63,7 @@ class APIIndexNodeInstanceDocumentListView(generics.ListAPIView): def get_queryset(self): index_node_instance = get_object_or_404( - IndexInstanceNode, pk=self.kwargs['pk'] + klass=IndexInstanceNode, pk=self.kwargs['pk'] ) AccessControlList.objects.check_access( permissions=permission_document_indexing_view, @@ -110,7 +110,7 @@ class APIDocumentIndexListView(generics.ListAPIView): serializer_class = IndexInstanceNodeSerializer def get_queryset(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_view, user=self.request.user, obj=document diff --git a/mayan/apps/document_indexing/views.py b/mayan/apps/document_indexing/views.py index 50e9c8fdeb..6a015ce7bf 100644 --- a/mayan/apps/document_indexing/views.py +++ b/mayan/apps/document_indexing/views.py @@ -118,7 +118,7 @@ class SetupIndexDocumentTypesView(AssignRemoveView): } def get_object(self): - return get_object_or_404(Index, pk=self.kwargs['pk']) + return get_object_or_404(klass=Index, pk=self.kwargs['pk']) def left_list(self): return AssignRemoveView.generate_choices( @@ -148,7 +148,7 @@ class SetupIndexTreeTemplateListView(SingleObjectListView): } def get_index(self): - return get_object_or_404(Index, pk=self.kwargs['pk']) + return get_object_or_404(klass=Index, pk=self.kwargs['pk']) def get_object_list(self): return self.get_index().template_root.get_descendants( @@ -184,7 +184,7 @@ class TemplateNodeCreateView(SingleObjectCreateView): } def get_parent_node(self): - return get_object_or_404(IndexTemplateNode, pk=self.kwargs['pk']) + return get_object_or_404(klass=IndexTemplateNode, pk=self.kwargs['pk']) class TemplateNodeDeleteView(SingleObjectDeleteView): @@ -259,7 +259,7 @@ class IndexInstanceNodeView(DocumentListView): def dispatch(self, request, *args, **kwargs): self.index_instance_node = get_object_or_404( - IndexInstanceNode, pk=self.kwargs['pk'] + klass=IndexInstanceNode, pk=self.kwargs['pk'] ) AccessControlList.objects.check_access( @@ -339,7 +339,7 @@ class DocumentIndexNodeListView(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 { diff --git a/mayan/apps/document_parsing/api_views.py b/mayan/apps/document_parsing/api_views.py index 212ace6b09..7d29b61d94 100644 --- a/mayan/apps/document_parsing/api_views.py +++ b/mayan/apps/document_parsing/api_views.py @@ -25,11 +25,12 @@ class APIDocumentPageContentView(generics.RetrieveAPIView): serializer_class = DocumentPageContentSerializer def get_document(self): - return get_object_or_404(Document, pk=self.kwargs['document_pk']) + return get_object_or_404(klass=Document, pk=self.kwargs['document_pk']) 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): diff --git a/mayan/apps/document_parsing/views.py b/mayan/apps/document_parsing/views.py index 9ed149e018..10636ab59b 100644 --- a/mayan/apps/document_parsing/views.py +++ b/mayan/apps/document_parsing/views.py @@ -83,7 +83,7 @@ class DocumentParsingErrorsListView(SingleObjectListView): view_permission = permission_content_view 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 { @@ -143,7 +143,7 @@ class DocumentTypeSettingsEditView(SingleObjectEditView): post_action_redirect = reverse_lazy('documents:document_type_list') 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 { diff --git a/mayan/apps/document_signatures/views.py b/mayan/apps/document_signatures/views.py index 5f837902d6..4c0aa5d6fb 100644 --- a/mayan/apps/document_signatures/views.py +++ b/mayan/apps/document_signatures/views.py @@ -114,7 +114,7 @@ class DocumentVersionDetachedSignatureCreateView(FormView): ).dispatch(request, *args, **kwargs) def get_document_version(self): - return get_object_or_404(DocumentVersion, pk=self.kwargs['pk']) + return get_object_or_404(klass=DocumentVersion, pk=self.kwargs['pk']) def get_extra_context(self): return { @@ -213,7 +213,7 @@ class DocumentVersionEmbeddedSignatureCreateView(FormView): ).dispatch(request, *args, **kwargs) def get_document_version(self): - return get_object_or_404(DocumentVersion, pk=self.kwargs['pk']) + return get_object_or_404(klass=DocumentVersion, pk=self.kwargs['pk']) def get_extra_context(self): return { @@ -296,7 +296,7 @@ class DocumentVersionSignatureListView(SingleObjectListView): ).dispatch(request, *args, **kwargs) def get_document_version(self): - return get_object_or_404(DocumentVersion, pk=self.kwargs['pk']) + return get_object_or_404(klass=DocumentVersion, pk=self.kwargs['pk']) def get_extra_context(self): return { @@ -351,7 +351,7 @@ class DocumentVersionSignatureUploadView(SingleObjectCreateView): ).dispatch(request, *args, **kwargs) def get_document_version(self): - return get_object_or_404(DocumentVersion, pk=self.kwargs['pk']) + return get_object_or_404(klass=DocumentVersion, pk=self.kwargs['pk']) def get_extra_context(self): return { diff --git a/mayan/apps/document_states/api_views.py b/mayan/apps/document_states/api_views.py index dd3ada2d3f..0ba286e06b 100644 --- a/mayan/apps/document_states/api_views.py +++ b/mayan/apps/document_states/api_views.py @@ -35,7 +35,9 @@ class APIDocumentTypeWorkflowListView(generics.ListAPIView): serializer_class = WorkflowSerializer def get_document_type(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, @@ -100,7 +102,7 @@ class APIWorkflowDocumentTypeList(generics.ListCreateAPIView): else: permission_required = permission_workflow_edit - workflow = get_object_or_404(Workflow, pk=self.kwargs['pk']) + workflow = get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_required, user=self.request.user, @@ -153,7 +155,7 @@ class APIWorkflowDocumentTypeView(generics.RetrieveDestroyAPIView): else: permission_required = permission_workflow_edit - workflow = get_object_or_404(Workflow, pk=self.kwargs['pk']) + workflow = get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_required, user=self.request.user, @@ -256,7 +258,7 @@ class APIWorkflowStateListView(generics.ListCreateAPIView): else: permission_required = permission_workflow_edit - workflow = get_object_or_404(Workflow, pk=self.kwargs['pk']) + workflow = get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_required, user=self.request.user, @@ -299,7 +301,7 @@ class APIWorkflowStateView(generics.RetrieveUpdateDestroyAPIView): else: permission_required = permission_workflow_edit - workflow = get_object_or_404(Workflow, pk=self.kwargs['pk']) + workflow = get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_required, user=self.request.user, @@ -352,7 +354,7 @@ class APIWorkflowTransitionListView(generics.ListCreateAPIView): else: permission_required = permission_workflow_edit - workflow = get_object_or_404(Workflow, pk=self.kwargs['pk']) + workflow = get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_required, user=self.request.user, @@ -406,7 +408,7 @@ class APIWorkflowTransitionView(generics.RetrieveUpdateDestroyAPIView): else: permission_required = permission_workflow_edit - workflow = get_object_or_404(Workflow, pk=self.kwargs['pk']) + workflow = get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_required, user=self.request.user, @@ -430,7 +432,7 @@ class APIWorkflowInstanceListView(generics.ListAPIView): } 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_workflow_view, user=self.request.user, @@ -455,7 +457,7 @@ class APIWorkflowInstanceView(generics.RetrieveAPIView): serializer_class = WorkflowInstanceSerializer 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_workflow_view, user=self.request.user, @@ -474,7 +476,7 @@ class APIWorkflowInstanceLogEntryListView(generics.ListCreateAPIView): post: Transition a document workflow by creating a new document workflow log entry. """ 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']) if self.request.method == 'GET': """ @@ -521,7 +523,7 @@ class APIWorkflowInstanceLogEntryListView(generics.ListCreateAPIView): def get_workflow_instance(self): workflow = get_object_or_404( - self.get_document().workflows, pk=self.kwargs['workflow_pk'] + klass=self.get_document().workflows, pk=self.kwargs['workflow_pk'] ) return workflow diff --git a/mayan/apps/document_states/views/workflow_instance_views.py b/mayan/apps/document_states/views/workflow_instance_views.py index 33eab52c4d..034e8786ab 100644 --- a/mayan/apps/document_states/views/workflow_instance_views.py +++ b/mayan/apps/document_states/views/workflow_instance_views.py @@ -32,7 +32,7 @@ class DocumentWorkflowInstanceListView(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 { @@ -81,7 +81,7 @@ class WorkflowInstanceDetailView(SingleObjectListView): return self.get_workflow_instance().log_entries.order_by('-datetime') def get_workflow_instance(self): - return get_object_or_404(WorkflowInstance, pk=self.kwargs['pk']) + return get_object_or_404(klass=WorkflowInstance, pk=self.kwargs['pk']) class WorkflowInstanceTransitionView(FormView): @@ -121,4 +121,4 @@ class WorkflowInstanceTransitionView(FormView): return self.get_workflow_instance().get_absolute_url() def get_workflow_instance(self): - return get_object_or_404(WorkflowInstance, pk=self.kwargs['pk']) + return get_object_or_404(klass=WorkflowInstance, pk=self.kwargs['pk']) diff --git a/mayan/apps/document_states/views/workflow_proxy_views.py b/mayan/apps/document_states/views/workflow_proxy_views.py index d3208ce0ee..85e45f0ec0 100644 --- a/mayan/apps/document_states/views/workflow_proxy_views.py +++ b/mayan/apps/document_states/views/workflow_proxy_views.py @@ -23,7 +23,7 @@ __all__ = ( class WorkflowDocumentListView(DocumentListView): def dispatch(self, request, *args, **kwargs): self.workflow = get_object_or_404( - WorkflowRuntimeProxy, pk=self.kwargs['pk'] + klass=WorkflowRuntimeProxy, pk=self.kwargs['pk'] ) AccessControlList.objects.check_access( @@ -109,7 +109,7 @@ class WorkflowStateDocumentListView(DocumentListView): def get_workflow_state(self): workflow_state = get_object_or_404( - WorkflowStateRuntimeProxy, pk=self.kwargs['pk'] + klass=WorkflowStateRuntimeProxy, pk=self.kwargs['pk'] ) AccessControlList.objects.check_access( @@ -156,4 +156,6 @@ class WorkflowStateListView(SingleObjectListView): ) def get_workflow(self): - return get_object_or_404(WorkflowRuntimeProxy, pk=self.kwargs['pk']) + return get_object_or_404( + klass=WorkflowRuntimeProxy, pk=self.kwargs['pk'] + ) diff --git a/mayan/apps/document_states/views/workflow_views.py b/mayan/apps/document_states/views/workflow_views.py index 2da8abbd5e..3582532bcc 100644 --- a/mayan/apps/document_states/views/workflow_views.py +++ b/mayan/apps/document_states/views/workflow_views.py @@ -128,7 +128,7 @@ class SetupWorkflowDocumentTypesView(AssignRemoveView): } def get_object(self): - return get_object_or_404(Workflow, pk=self.kwargs['pk']) + return get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) def left_list(self): return AssignRemoveView.generate_choices( @@ -189,7 +189,7 @@ class SetupWorkflowStateActionCreateView(SingleObjectDynamicFormCreateView): } def get_object(self): - return get_object_or_404(WorkflowState, pk=self.kwargs['pk']) + return get_object_or_404(klass=WorkflowState, pk=self.kwargs['pk']) def get_post_action_redirect(self): return reverse( @@ -290,7 +290,7 @@ class SetupWorkflowStateActionListView(SingleObjectListView): return self.get_workflow_state().actions.all() def get_workflow_state(self): - return get_object_or_404(WorkflowState, pk=self.kwargs['pk']) + return get_object_or_404(klass=WorkflowState, pk=self.kwargs['pk']) class SetupWorkflowStateActionSelectionView(FormView): @@ -317,7 +317,7 @@ class SetupWorkflowStateActionSelectionView(FormView): } def get_object(self): - return get_object_or_404(WorkflowState, pk=self.kwargs['pk']) + return get_object_or_404(klass=WorkflowState, pk=self.kwargs['pk']) # Workflow states @@ -343,7 +343,7 @@ class SetupWorkflowStateCreateView(SingleObjectCreateView): ) def get_workflow(self): - workflow = get_object_or_404(Workflow, pk=self.kwargs['pk']) + workflow = get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=(permission_workflow_edit,), obj=workflow, user=self.request.user @@ -378,7 +378,7 @@ class SetupWorkflowStateDeleteView(SingleObjectDeleteView): ) def get_workflow(self): - workflow = get_object_or_404(Workflow, pk=self.kwargs['pk']) + workflow = get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=(permission_workflow_edit,), obj=workflow, user=self.request.user @@ -441,7 +441,7 @@ class SetupWorkflowStateListView(SingleObjectListView): return self.get_workflow().states.all() def get_workflow(self): - return get_object_or_404(Workflow, pk=self.kwargs['pk']) + return get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) # Transitions @@ -490,7 +490,7 @@ class SetupWorkflowTransitionCreateView(SingleObjectCreateView): ) def get_workflow(self): - workflow = get_object_or_404(Workflow, pk=self.kwargs['pk']) + workflow = get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=(permission_workflow_edit,), obj=workflow, user=self.request.user @@ -571,7 +571,7 @@ class SetupWorkflowTransitionListView(SingleObjectListView): return self.get_workflow().transitions.all() def get_workflow(self): - return get_object_or_404(Workflow, pk=self.kwargs['pk']) + return get_object_or_404(klass=Workflow, pk=self.kwargs['pk']) class SetupWorkflowTransitionTriggerEventListView(FormView): @@ -612,7 +612,7 @@ class SetupWorkflowTransitionTriggerEventListView(FormView): ).form_valid(form=form) def get_object(self): - return get_object_or_404(WorkflowTransition, pk=self.kwargs['pk']) + return get_object_or_404(klass=WorkflowTransition, pk=self.kwargs['pk']) def get_extra_context(self): return { diff --git a/mayan/apps/documents/views/document_page_views.py b/mayan/apps/documents/views/document_page_views.py index b1f02793e8..ebc2417e9e 100644 --- a/mayan/apps/documents/views/document_page_views.py +++ b/mayan/apps/documents/views/document_page_views.py @@ -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( diff --git a/mayan/apps/documents/views/document_type_views.py b/mayan/apps/documents/views/document_type_views.py index a2b05bc64f..034412f2e6 100644 --- a/mayan/apps/documents/views/document_type_views.py +++ b/mayan/apps/documents/views/document_type_views.py @@ -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 { diff --git a/mayan/apps/documents/views/document_version_views.py b/mayan/apps/documents/views/document_version_views.py index 1d456bc68a..11da7a0244 100644 --- a/mayan/apps/documents/views/document_version_views.py +++ b/mayan/apps/documents/views/document_version_views.py @@ -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: diff --git a/mayan/apps/documents/views/document_views.py b/mayan/apps/documents/views/document_views.py index 79291a3e88..20fc6af025 100644 --- a/mayan/apps/documents/views/document_views.py +++ b/mayan/apps/documents/views/document_views.py @@ -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: diff --git a/mayan/apps/events/api_views.py b/mayan/apps/events/api_views.py index c5513f0ff3..195a117832 100644 --- a/mayan/apps/events/api_views.py +++ b/mayan/apps/events/api_views.py @@ -27,7 +27,7 @@ class APIObjectEventListView(generics.ListAPIView): def get_object(self): content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) diff --git a/mayan/apps/events/views.py b/mayan/apps/events/views.py index a596736ca3..27b86b50fe 100644 --- a/mayan/apps/events/views.py +++ b/mayan/apps/events/views.py @@ -156,7 +156,7 @@ class ObjectEventListView(EventListView): def dispatch(self, request, *args, **kwargs): self.object_content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) @@ -222,7 +222,7 @@ class ObjectEventTypeSubscriptionListView(FormView): def get_object(self): object_content_type = get_object_or_404( - ContentType, app_label=self.kwargs['app_label'], + klass=ContentType, app_label=self.kwargs['app_label'], model=self.kwargs['model'] ) @@ -295,7 +295,7 @@ class UserEventListView(SingleObjectListView): return Action.objects.actor(obj=self.get_user()) def get_user(self): - return get_object_or_404(get_user_model(), pk=self.kwargs['pk']) + return get_object_or_404(klass=get_user_model(), pk=self.kwargs['pk']) class VerbEventListView(SingleObjectListView): diff --git a/mayan/apps/linking/api_views.py b/mayan/apps/linking/api_views.py index be474e8865..5a6e0aaec0 100644 --- a/mayan/apps/linking/api_views.py +++ b/mayan/apps/linking/api_views.py @@ -32,7 +32,7 @@ class APIResolvedSmartLinkDocumentListView(generics.ListAPIView): serializer_class = ResolvedSmartLinkDocumentSerializer 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_view, user=self.request.user, @@ -43,7 +43,7 @@ class APIResolvedSmartLinkDocumentListView(generics.ListAPIView): def get_smart_link(self): smart_link = get_object_or_404( - SmartLink.objects.get_for(document=self.get_document()), + klass=SmartLink.objects.get_for(document=self.get_document()), pk=self.kwargs['smart_link_pk'] ) @@ -86,7 +86,7 @@ class APIResolvedSmartLinkView(generics.RetrieveAPIView): serializer_class = ResolvedSmartLinkSerializer 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_view, user=self.request.user, @@ -123,7 +123,7 @@ class APIResolvedSmartLinkListView(generics.ListAPIView): serializer_class = ResolvedSmartLinkSerializer 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_view, user=self.request.user, @@ -182,7 +182,7 @@ class APISmartLinkConditionListView(generics.ListCreateAPIView): else: permission_required = permission_smart_link_edit - smart_link = get_object_or_404(SmartLink, pk=self.kwargs['pk']) + smart_link = get_object_or_404(klass=SmartLink, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_required, user=self.request.user, @@ -225,7 +225,7 @@ class APISmartLinkConditionView(generics.RetrieveUpdateDestroyAPIView): else: permission_required = permission_smart_link_edit - smart_link = get_object_or_404(SmartLink, pk=self.kwargs['pk']) + smart_link = get_object_or_404(klass=SmartLink, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_required, user=self.request.user, diff --git a/mayan/apps/linking/views.py b/mayan/apps/linking/views.py index f7d99baa17..a07128d90a 100644 --- a/mayan/apps/linking/views.py +++ b/mayan/apps/linking/views.py @@ -33,10 +33,10 @@ logger = logging.getLogger(__name__) class ResolvedSmartLinkView(DocumentListView): def dispatch(self, request, *args, **kwargs): self.document = get_object_or_404( - Document, pk=self.kwargs['document_pk'] + klass=Document, pk=self.kwargs['document_pk'] ) self.smart_link = get_object_or_404( - SmartLink, pk=self.kwargs['smart_link_pk'] + klass=SmartLink, pk=self.kwargs['smart_link_pk'] ) AccessControlList.objects.check_access( @@ -114,7 +114,7 @@ class SetupSmartLinkDocumentTypesView(AssignRemoveView): } def get_object(self): - return get_object_or_404(SmartLink, pk=self.kwargs['pk']) + return get_object_or_404(klass=SmartLink, pk=self.kwargs['pk']) def left_list(self): # TODO: filter document type list by user ACL @@ -166,7 +166,7 @@ class SmartLinkListView(SingleObjectListView): class DocumentSmartLinkListView(SmartLinkListView): def dispatch(self, request, *args, **kwargs): - self.document = get_object_or_404(Document, pk=self.kwargs['pk']) + self.document = get_object_or_404(klass=Document, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_document_view, user=request.user, @@ -262,7 +262,7 @@ class SmartLinkConditionListView(SingleObjectListView): return self.get_smart_link().conditions.all() def get_smart_link(self): - return get_object_or_404(SmartLink, pk=self.kwargs['pk']) + return get_object_or_404(klass=SmartLink, pk=self.kwargs['pk']) class SmartLinkConditionCreateView(SingleObjectCreateView): @@ -300,7 +300,7 @@ class SmartLinkConditionCreateView(SingleObjectCreateView): return self.get_smart_link().conditions.all() def get_smart_link(self): - return get_object_or_404(SmartLink, pk=self.kwargs['pk']) + return get_object_or_404(klass=SmartLink, pk=self.kwargs['pk']) class SmartLinkConditionEditView(SingleObjectEditView): diff --git a/mayan/apps/mailer/views.py b/mayan/apps/mailer/views.py index cedd240eae..aac1b7b66c 100644 --- a/mayan/apps/mailer/views.py +++ b/mayan/apps/mailer/views.py @@ -211,7 +211,7 @@ class UserMailerLogEntryListView(SingleObjectListView): return self.get_user_mailer().error_log.all() def get_user_mailer(self): - return get_object_or_404(UserMailer, pk=self.kwargs['pk']) + return get_object_or_404(klass=UserMailer, pk=self.kwargs['pk']) class UserMailerListView(SingleObjectListView): @@ -255,7 +255,7 @@ class UserMailerTestView(FormView): } def get_object(self): - user_mailer = get_object_or_404(UserMailer, pk=self.kwargs['pk']) + user_mailer = get_object_or_404(klass=UserMailer, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_user_mailer_use, user=self.request.user, obj=user_mailer diff --git a/mayan/apps/metadata/api.py b/mayan/apps/metadata/api.py index 3848d0822d..9becfc1913 100644 --- a/mayan/apps/metadata/api.py +++ b/mayan/apps/metadata/api.py @@ -54,8 +54,7 @@ def save_metadata(metadata_dict, document, create=False, _user=None): parameters = { 'document': document, 'metadata_type': get_object_or_404( - MetadataType, - pk=metadata_dict['id'] + klass=MetadataType, pk=metadata_dict['id'] ) } @@ -71,8 +70,7 @@ def save_metadata(metadata_dict, document, create=False, _user=None): document_metadata = DocumentMetadata.objects.get( document=document, metadata_type=get_object_or_404( - MetadataType, - pk=metadata_dict['id'] + klass=MetadataType, pk=metadata_dict['id'] ), ) except DocumentMetadata.DoesNotExist: diff --git a/mayan/apps/metadata/api_views.py b/mayan/apps/metadata/api_views.py index ae9a2ab114..879dab4f33 100644 --- a/mayan/apps/metadata/api_views.py +++ b/mayan/apps/metadata/api_views.py @@ -39,7 +39,7 @@ class APIDocumentMetadataListView(generics.ListCreateAPIView): permission_required = permission_metadata_document_add document = get_object_or_404( - Document, pk=self.kwargs['document_pk'] + klass=Document, pk=self.kwargs['document_pk'] ) AccessControlList.objects.check_access( @@ -99,7 +99,7 @@ class APIDocumentMetadataView(generics.RetrieveUpdateDestroyAPIView): permission_required = permission_metadata_document_remove document = get_object_or_404( - Document, pk=self.kwargs['document_pk'] + klass=Document, pk=self.kwargs['document_pk'] ) AccessControlList.objects.check_access( @@ -171,7 +171,7 @@ class APIDocumentTypeMetadataTypeListView(generics.ListCreateAPIView): permission_required = permission_document_type_edit document_type = get_object_or_404( - DocumentType, pk=self.kwargs['document_type_pk'] + klass=DocumentType, pk=self.kwargs['document_type_pk'] ) AccessControlList.objects.check_access( @@ -228,7 +228,7 @@ class APIDocumentTypeMetadataTypeView(generics.RetrieveUpdateDestroyAPIView): permission_required = permission_document_type_edit document_type = get_object_or_404( - DocumentType, pk=self.kwargs['document_type_pk'] + klass=DocumentType, pk=self.kwargs['document_type_pk'] ) AccessControlList.objects.check_access( diff --git a/mayan/apps/metadata/views.py b/mayan/apps/metadata/views.py index a110dc7bdc..e74db2a23b 100644 --- a/mayan/apps/metadata/views.py +++ b/mayan/apps/metadata/views.py @@ -397,7 +397,7 @@ class DocumentMetadataListView(SingleObjectListView): ) 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): document = self.get_document() @@ -539,7 +539,7 @@ class DocumentMetadataRemoveView(MultipleObjectFormActionView): for form in form.forms: if form.cleaned_data['update']: metadata_type = get_object_or_404( - MetadataType, pk=form.cleaned_data['id'] + klass=MetadataType, pk=form.cleaned_data['id'] ) try: document_metadata = DocumentMetadata.objects.get( @@ -705,7 +705,7 @@ class SetupDocumentTypeMetadataTypes(FormView): return initial def get_object(self): - obj = get_object_or_404(self.model, pk=self.kwargs['pk']) + obj = get_object_or_404(klass=self.model, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=(permission_metadata_type_edit,), diff --git a/mayan/apps/ocr/api_views.py b/mayan/apps/ocr/api_views.py index fe6d17e8db..0dea74beb3 100644 --- a/mayan/apps/ocr/api_views.py +++ b/mayan/apps/ocr/api_views.py @@ -46,7 +46,7 @@ class APIDocumentVersionOCRView(generics.GenericAPIView): queryset = DocumentVersion.objects.all() def get_document(self): - return get_object_or_404(Document, pk=self.kwargs['document_pk']) + return get_object_or_404(klass=Document, pk=self.kwargs['document_pk']) def get_queryset(self): return self.get_document().versions.all() @@ -74,11 +74,12 @@ class APIDocumentPageOCRContentView(generics.RetrieveAPIView): serializer_class = DocumentPageOCRContentSerializer def get_document(self): - return get_object_or_404(Document, pk=self.kwargs['document_pk']) + return get_object_or_404(klass=Document, pk=self.kwargs['document_pk']) 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): diff --git a/mayan/apps/ocr/views.py b/mayan/apps/ocr/views.py index e6e3949d00..6d8f5d6aff 100644 --- a/mayan/apps/ocr/views.py +++ b/mayan/apps/ocr/views.py @@ -124,7 +124,7 @@ class DocumentTypeSettingsEditView(SingleObjectEditView): post_action_redirect = reverse_lazy('documents:document_type_list') 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 { @@ -153,7 +153,7 @@ class DocumentOCRErrorsListView(SingleObjectListView): object_permission = permission_ocr_document 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 { diff --git a/mayan/apps/permissions/views.py b/mayan/apps/permissions/views.py index fc6b9c3b70..ca5fefad39 100644 --- a/mayan/apps/permissions/views.py +++ b/mayan/apps/permissions/views.py @@ -34,7 +34,7 @@ class GroupRoleMembersView(AssignRemoveView): object_permission = permission_group_edit def add(self, item): - role = get_object_or_404(Role, pk=item) + role = get_object_or_404(klass=Role, pk=item) self.get_object().roles.add(role) def get_extra_context(self): @@ -44,7 +44,7 @@ class GroupRoleMembersView(AssignRemoveView): } def get_object(self): - return get_object_or_404(Group, pk=self.kwargs['pk']) + return get_object_or_404(klass=Group, pk=self.kwargs['pk']) def left_list(self): return [ @@ -57,7 +57,7 @@ class GroupRoleMembersView(AssignRemoveView): ] def remove(self, item): - role = get_object_or_404(Role, pk=item) + role = get_object_or_404(klass=Role, pk=item) self.get_object().roles.remove(role) @@ -87,7 +87,7 @@ class SetupRoleMembersView(AssignRemoveView): object_permission = permission_role_edit def add(self, item): - group = get_object_or_404(Group, pk=item) + group = get_object_or_404(klass=Group, pk=item) self.get_object().groups.add(group) def get_extra_context(self): @@ -101,7 +101,7 @@ class SetupRoleMembersView(AssignRemoveView): } def get_object(self): - return get_object_or_404(Role, pk=self.kwargs['pk']) + return get_object_or_404(klass=Role, pk=self.kwargs['pk']) def left_list(self): return [ @@ -114,7 +114,7 @@ class SetupRoleMembersView(AssignRemoveView): ] def remove(self, item): - group = get_object_or_404(Group, pk=item) + group = get_object_or_404(klass=Group, pk=item) self.get_object().groups.remove(group) @@ -148,7 +148,7 @@ class SetupRolePermissionsView(AssignRemoveView): Permission.check_permissions( self.request.user, permissions=(permission_permission_grant,) ) - permission = get_object_or_404(StoredPermission, pk=item) + permission = get_object_or_404(klass=StoredPermission, pk=item) self.get_object().permissions.add(permission) def dispatch(self, request, *args, **kwargs): @@ -169,7 +169,7 @@ class SetupRolePermissionsView(AssignRemoveView): } def get_object(self): - return get_object_or_404(Role, pk=self.kwargs['pk']) + return get_object_or_404(klass=Role, pk=self.kwargs['pk']) def left_list(self): Permission.refresh() @@ -189,7 +189,7 @@ class SetupRolePermissionsView(AssignRemoveView): Permission.check_permissions( self.request.user, permissions=(permission_permission_revoke,) ) - permission = get_object_or_404(StoredPermission, pk=item) + permission = get_object_or_404(klass=StoredPermission, pk=item) self.get_object().permissions.remove(permission) diff --git a/mayan/apps/sources/api_views.py b/mayan/apps/sources/api_views.py index e55530230d..f4f422ea39 100644 --- a/mayan/apps/sources/api_views.py +++ b/mayan/apps/sources/api_views.py @@ -21,7 +21,7 @@ class APIStagingSourceFileView(generics.GenericAPIView): def get(self, request, staging_folder_pk, encoded_filename): staging_folder = get_object_or_404( - StagingFolderSource, pk=staging_folder_pk + klass=StagingFolderSource, pk=staging_folder_pk ) return Response( StagingFolderFileSerializer( diff --git a/mayan/apps/sources/views.py b/mayan/apps/sources/views.py index 844a55d6dc..3b9a3bb47a 100644 --- a/mayan/apps/sources/views.py +++ b/mayan/apps/sources/views.py @@ -76,7 +76,7 @@ class SourceLogListView(SingleObjectListView): def get_source(self): return get_object_or_404( - Source.objects.select_subclasses(), pk=self.kwargs['pk'] + klass=Source.objects.select_subclasses(), pk=self.kwargs['pk'] ) @@ -112,7 +112,7 @@ class UploadBaseView(MultiFormView): def dispatch(self, request, *args, **kwargs): if 'source_id' in kwargs: self.source = get_object_or_404( - Source.objects.filter(enabled=True).select_subclasses(), + klass=Source.objects.filter(enabled=True).select_subclasses(), pk=kwargs['source_id'] ) else: @@ -198,7 +198,7 @@ class UploadInteractiveView(UploadBaseView): self.subtemplates_list = [] self.document_type = get_object_or_404( - DocumentType, + klass=DocumentType, pk=self.request.GET.get( 'document_type_id', self.request.POST.get('document_type_id') ) @@ -369,7 +369,9 @@ class UploadInteractiveVersionView(UploadBaseView): self.subtemplates_list = [] - self.document = get_object_or_404(Document, pk=kwargs['document_pk']) + self.document = get_object_or_404( + klass=Document, pk=kwargs['document_pk'] + ) # TODO: Try to remove this new version block check from here if NewVersionBlock.objects.is_blocked(self.document): @@ -492,7 +494,7 @@ class StagingFileDeleteView(SingleObjectDeleteView): def get_source(self): return get_object_or_404( - StagingFolderSource, pk=self.kwargs['pk'] + klass=StagingFolderSource, pk=self.kwargs['pk'] ) @@ -519,7 +521,9 @@ class SetupSourceCheckView(ConfirmView): } def get_object(self): - return get_object_or_404(Source.objects.select_subclasses(), pk=self.kwargs['pk']) + return get_object_or_404( + klass=Source.objects.select_subclasses(), pk=self.kwargs['pk'] + ) def view_action(self): task_check_interval_source.apply_async( @@ -553,7 +557,7 @@ class SetupSourceDeleteView(SingleObjectDeleteView): def get_object(self): return get_object_or_404( - Source.objects.select_subclasses(), pk=self.kwargs['pk'] + klass=Source.objects.select_subclasses(), pk=self.kwargs['pk'] ) def get_form_class(self): @@ -572,7 +576,7 @@ class SetupSourceEditView(SingleObjectEditView): def get_object(self): return get_object_or_404( - Source.objects.select_subclasses(), pk=self.kwargs['pk'] + klass=Source.objects.select_subclasses(), pk=self.kwargs['pk'] ) def get_form_class(self): diff --git a/mayan/apps/tags/api_views.py b/mayan/apps/tags/api_views.py index d62a6e50c2..86d0daba2e 100644 --- a/mayan/apps/tags/api_views.py +++ b/mayan/apps/tags/api_views.py @@ -86,7 +86,7 @@ class APITagDocumentListView(generics.ListAPIView): serializer_class = DocumentSerializer def get_queryset(self): - tag = get_object_or_404(Tag, pk=self.kwargs['pk']) + tag = get_object_or_404(klass=Tag, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_tag_view, user=self.request.user, obj=tag @@ -107,7 +107,7 @@ class APIDocumentTagListView(generics.ListCreateAPIView): } def get_document(self): - return get_object_or_404(Document, pk=self.kwargs['document_pk']) + return get_object_or_404(klass=Document, pk=self.kwargs['document_pk']) def get_queryset(self): document = self.get_document() @@ -162,7 +162,7 @@ class APIDocumentTagView(generics.RetrieveDestroyAPIView): serializer_class = DocumentTagSerializer def get_document(self): - document = get_object_or_404(Document, pk=self.kwargs['document_pk']) + document = get_object_or_404(klass=Document, pk=self.kwargs['document_pk']) AccessControlList.objects.check_access( permissions=permission_document_view, user=self.request.user, diff --git a/mayan/apps/tags/views.py b/mayan/apps/tags/views.py index b14d47ab4a..1f740d4a13 100644 --- a/mayan/apps/tags/views.py +++ b/mayan/apps/tags/views.py @@ -221,7 +221,7 @@ class TagListView(SingleObjectListView): class TagTaggedItemListView(DocumentListView): def get_tag(self): - return get_object_or_404(Tag, pk=self.kwargs['pk']) + return get_object_or_404(klass=Tag, pk=self.kwargs['pk']) def get_document_queryset(self): return self.get_tag().documents.all() @@ -240,7 +240,7 @@ class TagTaggedItemListView(DocumentListView): class DocumentTagListView(TagListView): def dispatch(self, request, *args, **kwargs): - self.document = get_object_or_404(Document, pk=self.kwargs['pk']) + self.document = get_object_or_404(klass=Document, pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=permission_document_view, user=request.user, diff --git a/mayan/apps/user_management/api_views.py b/mayan/apps/user_management/api_views.py index 3d725dec67..2d914424db 100644 --- a/mayan/apps/user_management/api_views.py +++ b/mayan/apps/user_management/api_views.py @@ -146,7 +146,7 @@ class APIUserGroupList(generics.ListCreateAPIView): else: permission = permission_user_edit - user = get_object_or_404(get_user_model(), pk=self.kwargs['pk']) + user = get_object_or_404(klass=get_user_model(), pk=self.kwargs['pk']) AccessControlList.objects.check_access( permissions=(permission,), user=self.request.user, diff --git a/mayan/apps/user_management/views.py b/mayan/apps/user_management/views.py index 5f74b1d1fb..f945bc738a 100644 --- a/mayan/apps/user_management/views.py +++ b/mayan/apps/user_management/views.py @@ -112,7 +112,7 @@ class GroupMembersView(AssignRemoveView): } def get_object(self): - return get_object_or_404(Group, pk=self.kwargs['pk']) + return get_object_or_404(klass=Group, pk=self.kwargs['pk']) def left_list(self): return GroupMembersView.generate_choices( @@ -237,7 +237,7 @@ class UserGroupsView(AssignRemoveView): def get_object(self): return get_object_or_404( - get_user_model().objects.filter( + klass=get_user_model().objects.filter( is_superuser=False, is_staff=False ), pk=self.kwargs['pk'] ) @@ -299,7 +299,7 @@ class UserOptionsEditView(SingleObjectEditView): def get_user(self): return get_object_or_404( - get_user_model().objects.filter( + klass=get_user_model().objects.filter( is_superuser=False, is_staff=False ), pk=self.kwargs['pk'] )