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/metadata/api.py
+2 -4
View File
@@ -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:
mayan/apps/metadata/api_views.py
+4 -4
View File
@@ -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(
mayan/apps/metadata/views.py
+3 -3
View File
@@ -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,),