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

[repo-setting] fix bug while checking download/upload links

Browse Source
This commit is contained in:
lian
2014-08-19 15:39:27 +08:00
committed by llj
parent 79b2790d24
commit b169e2d897
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
seahub/views/__init__.py
View File

@@ -455,6 +455,7 @@ def repo_settings(request, repo_id):
# download links # download links
fileshares = FileShare.objects.filter(repo_id=repo_id) fileshares = FileShare.objects.filter(repo_id=repo_id)
p_fileshares = []
for fs in fileshares: for fs in fileshares:
if fs.is_file_share_link(): if fs.is_file_share_link():
if seafile_api.get_file_id_by_path(repo.id, fs.path) is None: if seafile_api.get_file_id_by_path(repo.id, fs.path) is None:
@@ -482,15 +483,18 @@ def repo_settings(request, repo_id):
repo.id, repo.head_cmmt_id, path) repo.id, repo.head_cmmt_id, path)
fs.filesize = seafserv_threaded_rpc.get_dir_size(repo.store_id, fs.filesize = seafserv_threaded_rpc.get_dir_size(repo.store_id,
repo.version, dir_id) repo.version, dir_id)
p_fileshares.append(fs)
# upload links # upload links
uploadlinks = UploadLinkShare.objects.filter(repo_id=repo_id) uploadlinks = UploadLinkShare.objects.filter(repo_id=repo_id)
p_uploadlinks = []
for link in uploadlinks: for link in uploadlinks:
if seafile_api.get_dir_id_by_path(repo.id, link.path) is None: if seafile_api.get_dir_id_by_path(repo.id, link.path) is None:
link.delete() link.delete()
continue continue
link.dir_name = os.path.basename(link.path.rstrip('/')) link.dir_name = os.path.basename(link.path.rstrip('/'))
link.shared_link = gen_shared_upload_link(link.token) link.shared_link = gen_shared_upload_link(link.token)
p_uploadlinks.append(link)
return render_to_response('repo_settings.html', { return render_to_response('repo_settings.html', {
'repo': repo, 'repo': repo,
@@ -504,8 +508,8 @@ def repo_settings(request, repo_id):
'partial_history_enabled': partial_history_enabled, 'partial_history_enabled': partial_history_enabled,
'days_enabled': days_enabled, 'days_enabled': days_enabled,
'repo_password_min_length': REPO_PASSWORD_MIN_LENGTH, 'repo_password_min_length': REPO_PASSWORD_MIN_LENGTH,
'fileshares': fileshares, 'fileshares': p_fileshares,
'uploadlinks': uploadlinks, 'uploadlinks': p_uploadlinks,
}, context_instance=RequestContext(request)) }, context_instance=RequestContext(request))
@login_required_ajax @login_required_ajax