Fixed patching documents

openprocurement · Feb 11, 2015 · 5296a31 · 5296a31
1 parent 69dd414
commit 5296a31
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 8 deletions.
diff --git a/src/openprocurement/api/utils.py b/src/openprocurement/api/utils.py
@@ -61,14 +61,13 @@ def get_filename(data):
 
 
 def upload_file(request):
-    first_document = None
+    first_document = request.validated['documents'][0] if 'documents' in request.validated and request.validated['documents'] else None
     if request.content_type == 'multipart/form-data':
         data = request.validated['file']
         filename = get_filename(data)
         content_type = data.type
         in_file = data.file
     else:
-        first_document = request.validated['documents'][0]
         filename = first_document.title
         content_type = request.content_type
         in_file = request.body_file

diff --git a/src/openprocurement/api/views/award_complaint_document.py b/src/openprocurement/api/views/award_complaint_document.py
@@ -89,7 +89,7 @@ def put(self):
             LOGGER.info('Updated tender award complaint document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_complaint_document_put'})
             return {'data': document.serialize("view")}
 
-    @view(renderer='json', validators=(validate_patch_document_data,), permission='review_complaint')
+    @view(content_type="application/json", renderer='json', validators=(validate_patch_document_data,), permission='review_complaint')
     def patch(self):
         """Tender Award Complaint Document Update"""
         if self.request.validated['tender_status'] not in ['active.qualification', 'active.awarded']:

diff --git a/src/openprocurement/api/views/award_contract_document.py b/src/openprocurement/api/views/award_contract_document.py
@@ -99,7 +99,7 @@ def put(self):
             LOGGER.info('Updated tender award contract document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_contract_document_put'})
             return {'data': document.serialize("view")}
 
-    @view(renderer='json', validators=(validate_patch_document_data,), permission='edit_tender')
+    @view(content_type="application/json", renderer='json', validators=(validate_patch_document_data,), permission='edit_tender')
     def patch(self):
         """Tender Award Contract Document Update"""
         if self.request.validated['tender_status'] not in ['active.awarded', 'complete']:

diff --git a/src/openprocurement/api/views/award_document.py b/src/openprocurement/api/views/award_document.py
@@ -89,7 +89,7 @@ def put(self):
             LOGGER.info('Updated tender award document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_award_document_put'})
             return {'data': document.serialize("view")}
 
-    @view(renderer='json', validators=(validate_patch_document_data,), permission='edit_tender')
+    @view(content_type="application/json", renderer='json', validators=(validate_patch_document_data,), permission='edit_tender')
     def patch(self):
         """Tender Award Document Update"""
         if self.request.validated['tender_status'] != 'active.qualification':

diff --git a/src/openprocurement/api/views/bid_document.py b/src/openprocurement/api/views/bid_document.py
@@ -97,7 +97,7 @@ def put(self):
             LOGGER.info('Updated tender bid document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_bid_document_put'})
             return {'data': document.serialize("view")}
 
-    @view(renderer='json', validators=(validate_patch_document_data,), permission='edit_bid')
+    @view(content_type="application/json", renderer='json', validators=(validate_patch_document_data,), permission='edit_bid')
     def patch(self):
         """Tender Bid Document Update"""
         if self.request.validated['tender_status'] not in ['active.tendering', 'active.auction', 'active.qualification']:

diff --git a/src/openprocurement/api/views/complaint_document.py b/src/openprocurement/api/views/complaint_document.py
@@ -89,7 +89,7 @@ def put(self):
             LOGGER.info('Updated tender complaint document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_complaint_document_put'})
             return {'data': document.serialize("view")}
 
-    @view(renderer='json', validators=(validate_patch_document_data,), permission='review_complaint')
+    @view(content_type="application/json", renderer='json', validators=(validate_patch_document_data,), permission='review_complaint')
     def patch(self):
         """Tender Complaint Document Update"""
         if self.request.validated['tender_status'] not in ['active.enquiries', 'active.tendering', 'active.auction', 'active.qualification', 'active.awarded']:

diff --git a/src/openprocurement/api/views/tender_document.py b/src/openprocurement/api/views/tender_document.py
@@ -90,7 +90,7 @@ def put(self):
             LOGGER.info('Updated tender document {}'.format(self.request.context.id), extra={'MESSAGE_ID': 'tender_document_put'})
             return {'data': document.serialize("view")}
 
-    @view(renderer='json', permission='upload_tender_documents', validators=(validate_patch_document_data,))
+    @view(content_type="application/json", renderer='json', permission='upload_tender_documents', validators=(validate_patch_document_data,))
     def patch(self):
         """Tender Document Update"""
         if self.request.authenticated_role != 'auction' and self.request.validated['tender_status'] != 'active.enquiries' or \