From 44a330ac02f32ede853c40ce379d086a9f60297a Mon Sep 17 00:00:00 2001
From: liuzheng712 <liuzheng712@gmail.com>
Date: Fri, 6 Nov 2015 23:04:09 +0800
Subject: [PATCH] download page: waiting...

---
 jumpserver/urls.py      |  2 +-
 jumpserver/views.py     | 34 ++++++++++++++++++++++++++++------
 templates/download.html |  6 ++++++
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/jumpserver/urls.py b/jumpserver/urls.py
index 1f47918a1..c9a23b5ad 100644
--- a/jumpserver/urls.py
+++ b/jumpserver/urls.py
@@ -18,5 +18,5 @@ urlpatterns = patterns('',
     # (r'^jlog/', include('jlog.urls')),
     (r'^jperm/', include('jperm.urls')),
     (r'^node_auth/', 'jumpserver.views.node_auth'),
-
+    (r'download/(\d{4}/\d\d/\d\d/.*)', 'jumpserver.views.download_file')
 )
diff --git a/jumpserver/views.py b/jumpserver/views.py
index 2e5b1e519..d476e95c3 100644
--- a/jumpserver/views.py
+++ b/jumpserver/views.py
@@ -356,17 +356,18 @@ def Logout(request):
 #
 #     return HttpResponse(json.dumps(result, sort_keys=True, indent=2), content_type='application/json')
 
+
+#######################  liuzheng's  test(start) ########################
+from django.contrib.auth.decorators import login_required
+from juser.models import Document
+
+@login_required(login_url='/login')
 def upload(request):
     if request.method == 'GET':
         machines = [{'name':'aaa'}]
         return render_to_response('upload.html', locals(), context_instance=RequestContext(request))
     elif request.method == 'POST':
-        from juser.models import Document
         upload_files = request.FILES.getlist('file[]', None)
-        # form = DocumentForm(request.POST, request.FILES)
-        # if form.is_valid():
-        # for upload_file in upload_files:
-        print request.FILES
         for file in upload_files:
             print file
             newdoc = Document(docfile=file, user_id=request.user.id)
@@ -375,5 +376,26 @@ def upload(request):
     else:
         return HttpResponse("ERROR")
 
+@login_required(login_url='/login')
 def download(request):
-    return render_to_response('download.html', locals(), context_instance=RequestContext(request))
\ No newline at end of file
+    documents = []
+    for doc in Document.objects.filter(user_id=request.user.id).all():
+        documents.append('/'.join(str(doc.docfile).split('/')[2:]))
+    return render_to_response('download.html', locals(), context_instance=RequestContext(request))
+
+def download_file(request, path):
+    # TODO: get downlode file and make sure it is exist!
+    # by liuzheng
+    filepath = 'upload/' + str(request.user.id)+'/'+path
+    return HttpResponse(filepath)
+
+def node_auth(request):
+    return HttpResponse('nothing')
+def httperror(request):
+    return HttpResponse('nothing')
+def base(request):
+    return HttpResponse('nothing')
+def install(request):
+    return HttpResponse('nothing')
+
+#######################  liuzheng's  test(end) ########################
\ No newline at end of file
diff --git a/templates/download.html b/templates/download.html
index 461daf6cf..b1da555cf 100644
--- a/templates/download.html
+++ b/templates/download.html
@@ -29,6 +29,12 @@
             </div>
             <div class="ibox-content">
                <h2>下载文件可联系管理员在服务器安装lrzsz，使用sz命令下载。 </h2>
+                <div>
+                    {% for document in documents %}
+                    <a href="/download/{{ document  }}">{{ document  }}</a>
+                    {% endfor %}
+                </div>
+
             </div>
         </div>
     </div>