From bbb091659d451c9e1a1ca09e1e27bf4eaa66df0f Mon Sep 17 00:00:00 2001
From: xiez <xiez1989@gmail.com>
Date: Wed, 26 Sep 2012 20:44:15 +0800
Subject: [PATCH] Fixed recomend file in encrypt repo

---
 templates/decrypt_repo_form.html | 2 +-
 views.py                         | 9 +++++++++
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/templates/decrypt_repo_form.html b/templates/decrypt_repo_form.html
index 3e71a22158..8c5f4348cc 100644
--- a/templates/decrypt_repo_form.html
+++ b/templates/decrypt_repo_form.html
@@ -7,7 +7,7 @@
         <div class="repo-file-list-inner-container">
             <div class="repo-file-list-not-show">
                 <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>
                     <input type="hidden" name="repo_id" value="{{ repo.id }}" />
                     <input type="hidden" name="username" value="{{ request.user.username }}" />
diff --git a/views.py b/views.py
index ce9a920252..14340bf439 100644
--- a/views.py
+++ b/views.py
@@ -209,6 +209,9 @@ class RepoMixin(object):
         return current_commit
 
     def get_success_url(self):
+        next = self.request.GET.get('next', '')
+        if next:
+            return next
         return reverse('repo', args=[self.repo_id])
 
     def prepare_property(self):
@@ -1065,6 +1068,12 @@ def repo_view_file(request, repo_id):
     if not repo:
         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)
     if permission:
         # Get a token to visit file