Skip to content

J
jumpserver
Commit 3b00cfa9 authored by guanghongwei's avatar guanghongwei
Browse files
Options

޸ĸbug

parent 78f00e5c
Hide whitespace changes
Inline Side-by-side
Showing with 92 additions and 23 deletions
jumpserver/templatetags/mytags.py
View file @ 3b00cfa9
...@@ -221,6 +221,17 @@ def to_name(user_id): ...@@ -221,6 +221,17 @@ def to_name(user_id):
return '非法用户' 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') @register.filter(name='to_role_name')
def to_role_name(role_id): def to_role_name(role_id):
role_dict = {'0': '普通用户', '1': '部门管理员', '2': '超级管理员'} role_dict = {'0': '普通用户', '1': '部门管理员', '2': '超级管理员'}
......
jumpserver/urls.py
View file @ 3b00cfa9
...@@ -10,8 +10,8 @@ urlpatterns = patterns('', ...@@ -10,8 +10,8 @@ urlpatterns = patterns('',
(r'^base/$', 'jumpserver.views.base'), (r'^base/$', 'jumpserver.views.base'),
(r'^login/$', 'jumpserver.views.login'), (r'^login/$', 'jumpserver.views.login'),
(r'^logout/$', 'jumpserver.views.logout'), (r'^logout/$', 'jumpserver.views.logout'),
(r'^upload/$', 'jumpserver.views.upload'), (r'^file/upload/$', 'jumpserver.views.upload'),
(r'^download/$', 'jumpserver.views.download'), (r'^file/download/$', 'jumpserver.views.download'),
(r'^juser/', include('juser.urls')), (r'^juser/', include('juser.urls')),
(r'^jasset/', include('jasset.urls')), (r'^jasset/', include('jasset.urls')),
(r'^jlog/', include('jlog.urls')), (r'^jlog/', include('jlog.urls')),
......
jumpserver/views.py
View file @ 3b00cfa9
...@@ -287,6 +287,10 @@ def install(request): ...@@ -287,6 +287,10 @@ def install(request):
return HttpResponse('Ok') return HttpResponse('Ok')
def download(request):
return render_to_response('download.html', locals(), context_instance=RequestContext(request))
def transfer(sftp, filenames): def transfer(sftp, filenames):
# pool = Pool(processes=5) # pool = Pool(processes=5)
for filename, file_path in filenames.items(): for filename, file_path in filenames.items():
......
templates/download.html 0 → 100644
View file @ 3b00cfa9
{% extends 'base.html' %}
{% load mytags %}
{% block content %}
{% include 'nav_cat_bar.html' %}
<div class="wrapper wrapper-content animated fadeIn">
<div class="row">
<div class="col-lg-12">
<div class="ibox float-e-margins">
<div class="ibox-title">
<h5>下载文件</h5>
<div class="ibox-tools">
<a class="collapse-link">
<i class="fa fa-chevron-up"></i>
</a>
<a class="dropdown-toggle" data-toggle="dropdown" href="#">
<i class="fa fa-wrench"></i>
</a>
<ul class="dropdown-menu dropdown-user">
<li><a href="#">Config option 1</a>
</li>
<li><a href="#">Config option 2</a>
</li>
</ul>
<a class="close-link">
<i class="fa fa-times"></i>
</a>
</div>
</div>
<div class="ibox-content">
<h2>下载文件可联系管理员在服务器安装lrzsz，使用sz命令下载。 </h2>
</div>
</div>
</div>
</div>
</div>
{% endblock %}
\ No newline at end of file
templates/foot_script.html
View file @ 3b00cfa9
...@@ -33,4 +33,8 @@ ...@@ -33,4 +33,8 @@
if($("."+str1).length>0) { if($("."+str1).length>0) {
$("."+str1).addClass('active'); $("."+str1).addClass('active');
} }
if(str.length==0){
$("#index").addClass('active');
}
</script> </script>
templates/jperm/dept_perm_edit.html
View file @ 3b00cfa9
...@@ -2,20 +2,22 @@ ...@@ -2,20 +2,22 @@
{% load mytags %} {% load mytags %}
{% block content %} {% block content %}
{% include 'nav_cat_bar.html' %} {% include 'nav_cat_bar.html' %}
<script> <script type="text/javascript">
function filter_ip(text, noselect, total){ function search_ip(text, noselect, total){
alert(text);
$("#" + noselect).children().each( $("#" + noselect).children().each(
function(){ function(){
$(this).remove(); $(this).remove();
}); });
$("#" + total).children().each(function{ $("#" + total).children().each(function(){
if ($(this).text().search(text) != -1){ if($(this).text().search(text) != -1){
$("#" + noselect).append($(this).clone()) $("#" + noselect).append($(this).clone())
} }
}) })
} }
</script> </script>
<div class="wrapper wrapper-content animated fadeInRight"> <div class="wrapper wrapper-content animated fadeInRight">
...@@ -23,7 +25,7 @@ function filter_ip(text, noselect, total){ ...@@ -23,7 +25,7 @@ function filter_ip(text, noselect, total){
<div class="col-lg-10"> <div class="col-lg-10">
<div class="ibox float-e-margins"> <div class="ibox float-e-margins">
<div class="ibox-title"> <div class="ibox-title">
<h5> 部门授权添加 </h5> <h5> 部门授权编辑 </h5>
<div class="ibox-tools"> <div class="ibox-tools">
<a class="collapse-link"> <a class="collapse-link">
<i class="fa fa-chevron-up"></i> <i class="fa fa-chevron-up"></i>
...@@ -77,12 +79,12 @@ function filter_ip(text, noselect, total){ ...@@ -77,12 +79,12 @@ function filter_ip(text, noselect, total){
<div class="form-group"> <div class="form-group">
<label for="group_name" class="col-sm-2 control-label">过滤</label> <label for="group_name" class="col-sm-2 control-label">过滤</label>
<div class="col-sm-4"> <div class="col-sm-4">
<input id="noselect" class="form-control" onchange="filter_ip(this.value, 'assets', 'assets_total')"> <input id="noselect" class="form-control" oninput="search_ip(this.value, 'assets', 'assets_total')">
</div> </div>
<div class="col-sm-1"> <div class="col-sm-1">
</div> </div>
<div id="select" class="col-sm-3"> <div id="select" class="col-sm-3">
<input class="form-control"> <input class="form-control" oninput="search_ip(this.value, 'asset_select', 'asset_select_total')">
</div> </div>
</div> </div>
...@@ -101,7 +103,7 @@ function filter_ip(text, noselect, total){ ...@@ -101,7 +103,7 @@ function filter_ip(text, noselect, total){
<div class="col-sm-1"> <div class="col-sm-1">
<div class="btn-group" style="margin-top: 60px;"> <div class="btn-group" style="margin-top: 60px;">
<button type="button" class="btn btn-white" onclick="move('assets', 'asset_select')"><i class="fa fa-chevron-right"></i></button> <button type="button" class="btn btn-white" onclick="move('assets', 'asset_select' )"><i class="fa fa-chevron-right"></i></button>
<button type="button" class="btn btn-white" onclick="move('asset_select', 'assets')"><i class="fa fa-chevron-left"></i> </button> <button type="button" class="btn btn-white" onclick="move('asset_select', 'assets')"><i class="fa fa-chevron-left"></i> </button>
</div> </div>
</div> </div>
......
templates/nav.html
View file @ 3b00cfa9
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<div class="sidebar-collapse"> <div class="sidebar-collapse">
<ul class="nav" id="side-menu"> <ul class="nav" id="side-menu">
{% include 'nav_li_profile.html' %} {% include 'nav_li_profile.html' %}
<li> <li id="index">
<a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span><span class="label label-info pull-right"></span></a> <a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span><span class="label label-info pull-right"></span></a>
<!--<a href="index.html"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span> <span class="fa arrow"></span></a> <!--<a href="index.html"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span> <span class="fa arrow"></span></a>
<ul class="nav nav-second-level"> <ul class="nav nav-second-level">
...@@ -74,7 +74,7 @@ ...@@ -74,7 +74,7 @@
<div class="sidebar-collapse"> <div class="sidebar-collapse">
<ul class="nav" id="side-menu"> <ul class="nav" id="side-menu">
{% include 'nav_li_profile.html' %} {% include 'nav_li_profile.html' %}
<li> <li id="index">
<a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span><span class="label label-info pull-right"></span></a> <a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span><span class="label label-info pull-right"></span></a>
<!--<a href="index.html"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span> <span class="fa arrow"></span></a> <!--<a href="index.html"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span> <span class="fa arrow"></span></a>
<ul class="nav nav-second-level"> <ul class="nav nav-second-level">
...@@ -133,7 +133,7 @@ ...@@ -133,7 +133,7 @@
<div class="sidebar-collapse"> <div class="sidebar-collapse">
<ul class="nav" id="side-menu"> <ul class="nav" id="side-menu">
{% include 'nav_li_profile.html' %} {% include 'nav_li_profile.html' %}
<li> <li id="index">
<a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span><span class="label label-info pull-right"></span></a> <a href="/"><i class="fa fa-th-large"></i> <span class="nav-label">仪表盘</span><span class="label label-info pull-right"></span></a>
</li> </li>
<li class="user_detail"> <li class="user_detail">
...@@ -153,11 +153,11 @@ ...@@ -153,11 +153,11 @@
<a href="/jlog/log_list/online/"><i class="fa fa-files-o"></i> <span class="nav-label">登录历史</span><span class="label label-info pull-right"></span></a> <a href="/jlog/log_list/online/"><i class="fa fa-files-o"></i> <span class="nav-label">登录历史</span><span class="label label-info pull-right"></span></a>
</li> </li>
<li> <li id="file">
<a href="#"><i class="fa fa-download"></i> <span class="nav-label">上传下载</span><span class="fa arrow"></span></a> <a href="#"><i class="fa fa-download"></i> <span class="nav-label">上传下载</span><span class="fa arrow"></span></a>
<ul class="nav nav-second-level"> <ul class="nav nav-second-level">
<li><a href="/upload/">文件上传</a></li> <li class="upload"><a href="/file/upload/">文件上传</a></li>
<li><a href="/download/">文件下载</a></li> <li class="download"><a href="/file/download/">文件下载</a></li>
</ul> </ul>
</li> </li>
......
templates/nav_li_profile.html
View file @ 3b00cfa9
{% load mytags %} {% load mytags %}
<li class="nav-header"> <li class="nav-header">
<div class="dropdown profile-element"> <span> <div class="dropdown profile-element">
<img alt="image" class="img-circle" width="48" height="48" src="/static/img/{{ session_role_id | to_avatar }}.png" /> <span>
{# <img alt="image" class="img-circle" src="/static/img/profile_small.jpg">#} <img alt="image" class="img-circle" width="48" height="48" src="/static/img/{{ session_role_id | to_avatar }}.png" />
</span> </span>
<a data-toggle="dropdown" class="dropdown-toggle" href="#"> <a data-toggle="dropdown" class="dropdown-toggle" href="#">
<span class="clear"> <span class="block m-t-xs"> <strong class="font-bold">{{ session_user_id | to_name}}</strong> <span class="clear">
</span> <span class="text-muted text-xs block">{{ session_role_id | to_role_name }} <b class="caret"></b></span> </span> </a> <span class="block m-t-xs">
<strong class="font-bold">{{ session_user_id | to_name}} <span style="color: #8095a8">{{ session_user_id | to_dept_name}}</span></strong>
</span>
<span class="text-muted text-xs block">
{{ session_role_id | to_role_name }} <b class="caret"></b>
</span>
</span>
</a>
<ul class="dropdown-menu animated fadeInRight m-t-xs"> <ul class="dropdown-menu animated fadeInRight m-t-xs">
<li><a value="/juser/profile/?id={{ session_user_id }}" class="iframe">个人信息</a></li> <li><a value="/juser/profile/?id={{ session_user_id }}" class="iframe">个人信息</a></li>
<li><a href="/juser/chg_info/">修改信息</a></li> <li><a href="/juser/chg_info/">修改信息</a></li>
...@@ -16,6 +23,7 @@ ...@@ -16,6 +23,7 @@
<li><a href="/logout/">注销</a></li> <li><a href="/logout/">注销</a></li>
</ul> </ul>
</div> </div>
<div class="logo-element"> <div class="logo-element">
JS+ JS+
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment