haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-22 03:47:09 +00:00
Code Issues Releases Wiki Activity

Merge branch '6.0'

Browse Source 
Conflicts:
	media/js/base.js
	seahub/api2/views.py
	seahub/views/ajax.py
	tests/api/test_repo_user_folder_perm.py
This commit is contained in:
zhengxie
2017-02-17 17:11:33 +08:00
parent 096e2e06bb 08ce98ec19
commit d82df5fb52
176 changed files with 44016 additions and 40721 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
seahub/views/ajax.py
View File

@@ -594,18 +594,22 @@ def dirents_copy_move_common():
repo.store_id, repo.version, dir_obj_id)
# 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:
if seafile_api.is_repo_owner(request.user.username, dst_repo_id):
# if dst repo is my own repo, only check quota when copy.
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.
# always check quota when copy file
if view_method.__name__ == 'cp_dirents':
out_of_quota = seafile_api.check_quota(
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:
logger.error(e)
result['error'] = _(u'Internal server error')
@@ -1288,7 +1292,7 @@ def ajax_group_members_import(request, group_id):
@login_required_ajax
def ajax_repo_dir_recycle_more(request, repo_id):
"""
List 'more' repo/dir trash.
List first/'more' batch of repo/dir trash.
"""
result = {}
content_type = 'application/json; charset=utf-8'
@@ -1308,6 +1312,8 @@ def ajax_repo_dir_recycle_more(request, repo_id):
scan_stat = request.GET.get('scan_stat', None)
try:
# a list will be returned, with at least 1 item in it
# the last item is not a deleted entry, and it contains an attribute named 'scan_stat'
deleted_entries = seafile_api.get_deleted(repo_id, 0, path, scan_stat)
except SearpcError as e:
logger.error(e)
@@ -1319,10 +1325,6 @@ def ajax_repo_dir_recycle_more(request, repo_id):
trash_more = True if new_scan_stat is not None else False
more_entries_html = ''
# since there will always have one 'deleted_entry' to tell scan_stat,
# so if len of deleted_entries = 1, means have not get any trash dir/file
# if len of deleted_entries > 1,
# means have get trash dir/file from current scanned commits
if len(deleted_entries) > 1:
deleted_entries = deleted_entries[0:-1]
for dirent in deleted_entries:
@@ -1334,12 +1336,14 @@ def ajax_repo_dir_recycle_more(request, repo_id):
# Entries sort by deletion time in descending order.
deleted_entries.sort(lambda x, y : cmp(y.delete_time,
x.delete_time))
ctx = {
'show_recycle_root': True,
'repo': repo,
'dir_entries': deleted_entries,
'dir_path': path,
'MEDIA_URL': MEDIA_URL
'MEDIA_URL': MEDIA_URL,
'referer': request.GET.get('referer', '')
}
more_entries_html = render_to_string("snippets/repo_dir_trash_tr.html", ctx)