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

Fixed recomend file in encrypt repo

Browse Source
This commit is contained in:
xiez 2012-09-26 20:44:15 +08:00
parent 64bd2247bb
commit bbb091659d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/decrypt_repo_form.html
View File

@ -7,7 +7,7 @@
<div class="repo-file-list-inner-container"> <div class="repo-file-list-inner-container">
<div class="repo-file-list-not-show"> <div class="repo-file-list-not-show">
<p class="access-notice">该目录已加密。如需在线查看里面的内容，请输入解密密码。密码只会在服务器上暂存1小时。</p> <p class="access-notice">该目录已加密。如需在线查看里面的内容，请输入解密密码。密码只会在服务器上暂存1小时。</p>
<form action="{{ SITE_ROOT }}repo/{{ repo.id }}/" method="post"> <form action="{{ SITE_ROOT }}repo/{{ repo.id }}/?next={{ next }}" method="post">
<label>密码：</label> <label>密码：</label>
<input type="hidden" name="repo_id" value="{{ repo.id }}" /> <input type="hidden" name="repo_id" value="{{ repo.id }}" />
<input type="hidden" name="username" value="{{ request.user.username }}" /> <input type="hidden" name="username" value="{{ request.user.username }}" />

9
views.py
View File

@ -209,6 +209,9 @@ class RepoMixin(object):
return current_commit return current_commit
def get_success_url(self): def get_success_url(self):
next = self.request.GET.get('next', '')
if next:
return next
return reverse('repo', args=[self.repo_id]) return reverse('repo', args=[self.repo_id])
def prepare_property(self): def prepare_property(self):
@ -1065,6 +1068,12 @@ def repo_view_file(request, repo_id):
if not repo: if not repo:
raise Http404 raise Http404
if repo.encrypted and not is_passwd_set(repo_id, request.user.username):
# Redirect uesr to decrypt repo page.
return render_to_response('decrypt_repo_form.html', {
'repo': repo,
'next': request.get_full_path(),
}, context_instance=RequestContext(request))
permission = get_user_permission(request, repo_id) permission = get_user_permission(request, repo_id)
if permission: if permission:
# Get a token to visit file # Get a token to visit file