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
mayan/apps/document_states/api_views.py
+13 -11
View File
@@ -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
mayan/apps/document_states/views/workflow_instance_views.py
+3 -3
View File
@@ -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'])
mayan/apps/document_states/views/workflow_proxy_views.py
+5 -3
View File
@@ -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']
)
mayan/apps/document_states/views/workflow_views.py
+10 -10
View File
@@ -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 {