diff --git a/jumpserver/templatetags/mytags.py b/jumpserver/templatetags/mytags.py index a9c0539aa..a03212427 100644 --- a/jumpserver/templatetags/mytags.py +++ b/jumpserver/templatetags/mytags.py @@ -221,6 +221,17 @@ def to_name(user_id): return '非法用户' +@register.filter(name='to_dept_name') +def to_dept_name(user_id): + try: + user = User.objects.filter(id=int(user_id)) + if user: + user = user[0] + return user.dept.name + except: + return '非法部门' + + @register.filter(name='to_role_name') def to_role_name(role_id): role_dict = {'0': '普通用户', '1': '部门管理员', '2': '超级管理员'} diff --git a/jumpserver/urls.py b/jumpserver/urls.py index 9d78b0928..583f2ca96 100644 --- a/jumpserver/urls.py +++ b/jumpserver/urls.py @@ -10,8 +10,8 @@ urlpatterns = patterns('', (r'^base/$', 'jumpserver.views.base'), (r'^login/$', 'jumpserver.views.login'), (r'^logout/$', 'jumpserver.views.logout'), - (r'^upload/$', 'jumpserver.views.upload'), - (r'^download/$', 'jumpserver.views.download'), + (r'^file/upload/$', 'jumpserver.views.upload'), + (r'^file/download/$', 'jumpserver.views.download'), (r'^juser/', include('juser.urls')), (r'^jasset/', include('jasset.urls')), (r'^jlog/', include('jlog.urls')), diff --git a/jumpserver/views.py b/jumpserver/views.py index 7af477dc2..50438b4ca 100644 --- a/jumpserver/views.py +++ b/jumpserver/views.py @@ -287,6 +287,10 @@ def install(request): return HttpResponse('Ok') +def download(request): + return render_to_response('download.html', locals(), context_instance=RequestContext(request)) + + def transfer(sftp, filenames): # pool = Pool(processes=5) for filename, file_path in filenames.items(): diff --git a/templates/download.html b/templates/download.html new file mode 100644 index 000000000..461daf6cf --- /dev/null +++ b/templates/download.html @@ -0,0 +1,39 @@ +{% extends 'base.html' %} +{% load mytags %} +{% block content %} +{% include 'nav_cat_bar.html' %} + +
+
+
+
+
+
下载文件
+
+ + + + + + + + + + +
+
+
+

下载文件可联系管理员在服务器安装lrzsz，使用sz命令下载。

+
+
+
+
+
+ + +{% endblock %} \ No newline at end of file diff --git a/templates/foot_script.html b/templates/foot_script.html index 5cd6b71d4..df145a912 100644 --- a/templates/foot_script.html +++ b/templates/foot_script.html @@ -33,4 +33,8 @@ if($("."+str1).length>0) { $("."+str1).addClass('active'); } + + if(str.length==0){ + $("#index").addClass('active'); + } diff --git a/templates/jperm/dept_perm_edit.html b/templates/jperm/dept_perm_edit.html index a96509fb4..10c2d7fae 100644 --- a/templates/jperm/dept_perm_edit.html +++ b/templates/jperm/dept_perm_edit.html @@ -2,20 +2,22 @@ {% load mytags %} {% block content %} {% include 'nav_cat_bar.html' %} -
@@ -23,7 +25,7 @@ function filter_ip(text, noselect, total){
-
部门授权添加
+
部门授权编辑
@@ -77,12 +79,12 @@ function filter_ip(text, noselect, total){
- +
- +
@@ -101,7 +103,7 @@ function filter_ip(text, noselect, total){
- +
diff --git a/templates/nav.html b/templates/nav.html index e132c5b35..215a56435 100644 --- a/templates/nav.html +++ b/templates/nav.html @@ -3,7 +3,7 @@