haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-23 12:27:48 +00:00
Code Issues Releases Wiki Activity

update file lock error check

Browse Source
This commit is contained in:
lian
2015-07-20 13:53:07 +08:00
parent 2aa15a7d19
commit 3ec770e7d8
4 changed files with 59 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
seahub/views/ajax.py
View File

@@ -656,6 +656,12 @@ def rename_dirent(request, repo_id):
content_type=content_type)
is_locked, locked_by_me = check_file_lock(repo_id, full_path, username)
if (is_locked, locked_by_me) == (None, None):
# check file lock error
err_msg = _('Check file lock error')
return HttpResponse(json.dumps({'error': err_msg}), status=500,
content_type=content_type)
if is_locked and not locked_by_me:
err_msg = _('File is locked')
return HttpResponse(json.dumps({'error': err_msg}), status=403,
@@ -718,6 +724,12 @@ def delete_dirent(request, repo_id):
content_type=content_type)
is_locked, locked_by_me = check_file_lock(repo_id, full_path, username)
if (is_locked, locked_by_me) == (None, None):
# check file lock error
err_msg = _('Check file lock error')
return HttpResponse(json.dumps({'error': err_msg}), status=500,
content_type=content_type)
if is_locked and not locked_by_me:
err_msg = _('File is locked')
return HttpResponse(json.dumps({'error': err_msg}), status=403,
@@ -846,12 +858,17 @@ def mv_file(request, src_repo_id, src_path, dst_repo_id, dst_path, obj_name):
file_path = posixpath.join(src_path, obj_name)
is_locked, locked_by_me = check_file_lock(src_repo_id, file_path, username)
if (is_locked, locked_by_me) == (None, None):
# check file lock error
err_msg = _('Check file lock error')
return HttpResponse(json.dumps({'error': err_msg}), status=500,
content_type=content_type)
if is_locked and not locked_by_me:
err_msg = _('File is locked')
return HttpResponse(json.dumps({'error': err_msg}), status=403,
content_type=content_type)
new_obj_name = check_filename_with_rename(dst_repo_id, dst_path, obj_name)
try:
res = seafile_api.move_file(src_repo_id, src_path, obj_name,