haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-19 10:26:17 +00:00
Code Issues Releases Wiki Activity

Merge branch '11.0'

Browse Source
This commit is contained in:
r350178982
2024-07-26 12:01:16 +08:00
parent 808e802499 500562b2ed
commit 5456aa19ed
1 changed files with 10 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
seahub/seadoc/apis.py
View File

@@ -164,12 +164,9 @@ class SeadocUploadFile(APIView):
return api_error(status.HTTP_404_NOT_FOUND, error_msg)
# update file
files = {
'file': file,
'file_name': uuid_map.filename,
'target_file': file_path,
}
resp = requests.post(upload_link, files=files)
files = {'file': file}
data = {'filename': uuid_map.filename, 'target_file': file_path}
resp = requests.post(upload_link, files=files, data=data)
if not resp.ok:
logger.error('save sdoc failed %s, %s' % (file_uuid, resp.text))
return api_error(resp.status_code, resp.content)
@@ -381,12 +378,8 @@ class SeadocUploadImage(APIView):
relative_path = []
for file in file_list:
file_path = posixpath.join(parent_path, file.name)
files = {
'file': file,
'file_name': file.name,
'target_file': file_path,
}
data = {'parent_dir': parent_path}
files = {'file': file}
data = {'parent_dir': parent_path, 'filename': file.name, 'target_file': file_path}
resp = requests.post(upload_link, files=files, data=data)
if not resp.ok:
logger.error(resp.text)
@@ -573,12 +566,8 @@ class SeadocCopyHistoryFile(APIView):
error_msg = 'Internal Server Error'
return api_error(status.HTTP_500_INTERNAL_SERVER_ERROR, error_msg)
upload_link = gen_inner_file_upload_url('upload-api', token)
files = {
'file': file,
'file_name': new_file_name,
'target_file': new_file_path,
}
data = {'parent_dir': parent_dir}
files = {'file': file}
data = {'parent_dir': parent_dir, 'filename': new_file_name, 'target_file': new_file_path}
resp = requests.post(upload_link, files=files, data=data)
if not resp.ok:
logger.error(resp.text)
@@ -2089,12 +2078,9 @@ class SeadocRevisionView(APIView):
# rewrite file
file = request.FILES.get('file', None)
files = {
'file': file,
'file_name': uuid_map.filename,
'target_file': file_path,
}
resp = requests.post(upload_link, files=files)
files = {'file': file}
data = {'filename': uuid_map.filename, 'target_file': file_path}
resp = requests.post(upload_link, files=files, data=data)
if not resp.ok:
logger.error(resp.text)
error_msg = 'Internal Server Error'