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

Merge pull request #1446 from haiwen/check_quota

Browse Source 
update quota check when copy/move file/dir
This commit is contained in:
xiez
2017-01-07 15:43:09 +08:00
committed by GitHub
parent 3c3278a644 532a16ad0b
commit 8dc1fc132f
1 changed files with 25 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
seahub/views/ajax.py
View File

@@ -654,16 +654,20 @@ def copy_move_common():
repo.version, dir_obj_id) repo.version, dir_obj_id)
# check quota # check quota
out_of_quota = False src_repo_owner = seafile_api.get_repo_owner(repo_id)
dst_repo_owner = seafile_api.get_repo_owner(dst_repo_id)
try: try:
if seafile_api.is_repo_owner(request.user.username, dst_repo_id): # always check quota when copy file
# if dst repo is my own repo, only check quota when copy. if view_method.__name__ in ('cp_file', 'cp_dir'):
if view_method.__name__ in ('cp_file', 'cp_dir'):
out_of_quota = seafile_api.check_quota(dst_repo_id, delta=obj_size)
else:
# if dst repo is NOT my own repo,
# check quota when copy AND move.
out_of_quota = seafile_api.check_quota(dst_repo_id, delta=obj_size) out_of_quota = seafile_api.check_quota(dst_repo_id, delta=obj_size)
else:
# when move file
if src_repo_owner != dst_repo_owner:
# only check quota when src_repo_owner != dst_repo_owner
out_of_quota = seafile_api.check_quota(dst_repo_id, delta=obj_size)
else:
# not check quota when src and dst repo are both mine
out_of_quota = False
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
result['error'] = _(u'Internal server error') result['error'] = _(u'Internal server error')
@@ -911,18 +915,22 @@ def dirents_copy_move_common():
repo.store_id, repo.version, dir_obj_id) repo.store_id, repo.version, dir_obj_id)
# check quota # check quota
out_of_quota = False src_repo_owner = seafile_api.get_repo_owner(repo_id)
dst_repo_owner = seafile_api.get_repo_owner(dst_repo_id)
try: try:
if seafile_api.is_repo_owner(request.user.username, dst_repo_id): # always check quota when copy file
# if dst repo is my own repo, only check quota when copy. if view_method.__name__ == 'cp_dirents':
if view_method.__name__ == 'cp_dirents':
out_of_quota = seafile_api.check_quota(
dst_repo_id, delta=file_obj_size + dir_obj_size)
else:
# if dst repo is NOT my own repo,
# check quota when copy AND move.
out_of_quota = seafile_api.check_quota( out_of_quota = seafile_api.check_quota(
dst_repo_id, delta=file_obj_size + dir_obj_size) dst_repo_id, delta=file_obj_size + dir_obj_size)
else:
# when move file
if src_repo_owner != dst_repo_owner:
# only check quota when src_repo_owner != dst_repo_owner
out_of_quota = seafile_api.check_quota(
dst_repo_id, delta=file_obj_size + dir_obj_size)
else:
# not check quota when src and dst repo are both mine
out_of_quota = False
except Exception as e: except Exception as e:
logger.error(e) logger.error(e)
result['error'] = _(u'Internal server error') result['error'] = _(u'Internal server error')