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

Make the new document label optional, the backend will use the filename is none is specified

Browse Source
This commit is contained in:
Roberto Rosario
2014-10-27 05:19:41 -04:00
parent 546a593e26
commit 744d8ec0d8
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mayan/apps/documents/api_views.py
+1 -2
View File
@@ -62,7 +62,6 @@ class APINewDocumentView(generics.GenericAPIView):
serializer = self.get_serializer(data=request.DATA, files=request.FILES) serializer = self.get_serializer(data=request.DATA, files=request.FILES)
if serializer.is_valid(): if serializer.is_valid():
print serializer.data
temporary_file = tempfile.NamedTemporaryFile(delete=False) temporary_file = tempfile.NamedTemporaryFile(delete=False)
source_file = request.FILES['file'] source_file = request.FILES['file']
for chunk in source_file.chunks(): for chunk in source_file.chunks():
@@ -75,7 +74,7 @@ class APINewDocumentView(generics.GenericAPIView):
document_type_id=serializer.data['document_type'], document_type_id=serializer.data['document_type'],
description=serializer.data['description'], description=serializer.data['description'],
expand=serializer.data['expand'], expand=serializer.data['expand'],
label=serializer.data['label'], label=serializer.data['label'] or serializer.data['file'],
language=serializer.data['language'], language=serializer.data['language'],
user_id=serializer.data['user'] user_id=serializer.data['user']
), queue='uploads') ), queue='uploads')
mayan/apps/documents/serializers.py
+1 -1
View File
@@ -51,6 +51,6 @@ class NewDocumentSerializer(serializers.Serializer):
document_type = serializers.ChoiceField(choices=[(document_type.pk, document_type) for document_type in DocumentType.objects.all()]) document_type = serializers.ChoiceField(choices=[(document_type.pk, document_type) for document_type in DocumentType.objects.all()])
expand = serializers.BooleanField(default=False) expand = serializers.BooleanField(default=False)
file = serializers.FileField() file = serializers.FileField()
label = serializers.CharField() label = serializers.CharField(required=False)
language = serializers.ChoiceField(choices=LANGUAGE_CHOICES, blank_display_value=None, required=False) language = serializers.ChoiceField(choices=LANGUAGE_CHOICES, blank_display_value=None, required=False)
user = serializers.ChoiceField(required=False, choices=[(user.pk, user) for user in User.objects.all()]) user = serializers.ChoiceField(required=False, choices=[(user.pk, user) for user in User.objects.all()])